Browse Source

Move atom/browser/ui/gtk to chrome/.

Cheng Zhao 11 years ago
parent
commit
68cb6ee861

+ 12 - 12
atom.gyp

@@ -123,18 +123,6 @@
       'atom/browser/ui/file_dialog_gtk.cc',
       'atom/browser/ui/file_dialog_mac.mm',
       'atom/browser/ui/file_dialog_win.cc',
-      'atom/browser/ui/gtk/gtk_custom_menu.cc',
-      'atom/browser/ui/gtk/gtk_custom_menu.h',
-      'atom/browser/ui/gtk/gtk_custom_menu_item.cc',
-      'atom/browser/ui/gtk/gtk_custom_menu_item.h',
-      'atom/browser/ui/gtk/gtk_util.cc',
-      'atom/browser/ui/gtk/gtk_util.h',
-      'atom/browser/ui/gtk/gtk_window_util.cc',
-      'atom/browser/ui/gtk/gtk_window_util.h',
-      'atom/browser/ui/gtk/event_utils.cc',
-      'atom/browser/ui/gtk/event_utils.h',
-      'atom/browser/ui/gtk/menu_gtk.cc',
-      'atom/browser/ui/gtk/menu_gtk.h',
       'atom/browser/ui/message_box.h',
       'atom/browser/ui/message_box_gtk.cc',
       'atom/browser/ui/message_box_mac.mm',
@@ -212,6 +200,18 @@
       'atom/renderer/atom_render_view_observer.h',
       'atom/renderer/atom_renderer_client.cc',
       'atom/renderer/atom_renderer_client.h',
+      'chrome/browser/ui/gtk/event_utils.cc',
+      'chrome/browser/ui/gtk/event_utils.h',
+      'chrome/browser/ui/gtk/gtk_custom_menu.cc',
+      'chrome/browser/ui/gtk/gtk_custom_menu.h',
+      'chrome/browser/ui/gtk/gtk_custom_menu_item.cc',
+      'chrome/browser/ui/gtk/gtk_custom_menu_item.h',
+      'chrome/browser/ui/gtk/gtk_util.cc',
+      'chrome/browser/ui/gtk/gtk_util.h',
+      'chrome/browser/ui/gtk/gtk_window_util.cc',
+      'chrome/browser/ui/gtk/gtk_window_util.h',
+      'chrome/browser/ui/gtk/menu_gtk.cc',
+      'chrome/browser/ui/gtk/menu_gtk.h',
     ],
     'framework_sources': [
       'atom/app/atom_library_main.cc',

+ 1 - 1
atom/browser/api/atom_api_menu_gtk.h

@@ -6,7 +6,7 @@
 #define ATOM_BROWSER_API_ATOM_API_MENU_GTK_H_
 
 #include "atom/browser/api/atom_api_menu.h"
-#include "atom/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
 
 namespace atom {
 

+ 1 - 1
atom/browser/native_window_gtk.cc

@@ -5,7 +5,7 @@
 #include "atom/browser/native_window_gtk.h"
 
 #include "base/values.h"
-#include "atom/browser/ui/gtk/gtk_window_util.h"
+#include "chrome/browser/ui/gtk/gtk_window_util.h"
 #include "atom/common/draggable_region.h"
 #include "atom/common/options_switches.h"
 #include "content/public/browser/web_contents.h"

+ 1 - 1
atom/browser/native_window_gtk.h

@@ -9,7 +9,7 @@
 
 #include "atom/browser/native_window.h"
 #include "atom/browser/ui/accelerator_util.h"
-#include "atom/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/gtk/gtk_signal.h"

+ 1 - 1
atom/browser/ui/file_dialog_gtk.cc

@@ -7,7 +7,7 @@
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "atom/browser/native_window.h"
-#include "atom/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/base/gtk/gtk_signal.h"
 
 namespace file_dialog {

+ 1 - 1
atom/browser/ui/message_box_gtk.cc

@@ -7,7 +7,7 @@
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "atom/browser/native_window.h"
-#include "atom/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/base/gtk/gtk_signal.h"
 
 namespace atom {

+ 1 - 1
atom/browser/ui/gtk/event_utils.cc → chrome/browser/ui/gtk/event_utils.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/gtk/event_utils.h"
+#include "chrome/browser/ui/gtk/event_utils.h"
 
 #include "base/logging.h"
 #include "ui/base/window_open_disposition.h"

+ 0 - 0
atom/browser/ui/gtk/event_utils.h → chrome/browser/ui/gtk/event_utils.h


+ 2 - 2
atom/browser/ui/gtk/gtk_custom_menu.cc → chrome/browser/ui/gtk/gtk_custom_menu.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/gtk/gtk_custom_menu.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu.h"
 
-#include "atom/browser/ui/gtk/gtk_custom_menu_item.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
 
 G_DEFINE_TYPE(GtkCustomMenu, gtk_custom_menu, GTK_TYPE_MENU)
 

+ 0 - 0
atom/browser/ui/gtk/gtk_custom_menu.h → chrome/browser/ui/gtk/gtk_custom_menu.h


+ 2 - 2
atom/browser/ui/gtk/gtk_custom_menu_item.cc → chrome/browser/ui/gtk/gtk_custom_menu_item.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/gtk/gtk_custom_menu_item.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
 
 #include "base/i18n/rtl.h"
-#include "atom/browser/ui/gtk/gtk_custom_menu.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu.h"
 #include "ui/gfx/gtk_compat.h"
 
 // This method was autogenerated by the program glib-genmarshall, which

+ 0 - 0
atom/browser/ui/gtk/gtk_custom_menu_item.h → chrome/browser/ui/gtk/gtk_custom_menu_item.h


+ 1 - 1
atom/browser/ui/gtk/gtk_util.cc → chrome/browser/ui/gtk/gtk_util.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 
 #include <cairo/cairo.h>
 

+ 3 - 3
atom/browser/ui/gtk/gtk_util.h → chrome/browser/ui/gtk/gtk_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_GTK_GTK_UTIL_H_
-#define ATOM_BROWSER_UI_GTK_GTK_UTIL_H_
+#ifndef CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
+#define CHROME_BROWSER_UI_GTK_GTK_UTIL_H_
 
 #include <gtk/gtk.h>
 #include <string>
@@ -33,4 +33,4 @@ void SetLabelWidth(GtkWidget* label, int pixel_width);
 
 }  // namespace gtk_util
 
-#endif  // ATOM_BROWSER_UI_GTK_GTK_UTIL_H_
+#endif  // CHROME_BROWSER_UI_GTK_GTK_UTIL_H_

+ 1 - 1
atom/browser/ui/gtk/gtk_window_util.cc → chrome/browser/ui/gtk/gtk_window_util.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/gtk/gtk_window_util.h"
+#include "chrome/browser/ui/gtk/gtk_window_util.h"
 
 #include <dlfcn.h>
 #include "content/public/browser/render_view_host.h"

+ 3 - 3
atom/browser/ui/gtk/gtk_window_util.h → chrome/browser/ui/gtk/gtk_window_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_GTK_GTK_WINDOW_UTIL_H_
-#define ATOM_BROWSER_UI_GTK_GTK_WINDOW_UTIL_H_
+#ifndef CHROME_BROWSER_UI_GTK_GTK_WINDOW_UTIL_H_
+#define CHROME_BROWSER_UI_GTK_GTK_WINDOW_UTIL_H_
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -71,4 +71,4 @@ bool GetWindowEdge(const gfx::Size& window_size,
 
 }  // namespace gtk_window_util
 
-#endif  // ATOM_BROWSER_UI_GTK_GTK_WINDOW_UTIL_H_
+#endif  // CHROME_BROWSER_UI_GTK_GTK_WINDOW_UTIL_H_

+ 5 - 5
atom/browser/ui/gtk/menu_gtk.cc → chrome/browser/ui/gtk/menu_gtk.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
 
 #include <map>
 
@@ -12,10 +12,10 @@
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "atom/browser/ui/gtk/event_utils.h"
-#include "atom/browser/ui/gtk/gtk_custom_menu.h"
-#include "atom/browser/ui/gtk/gtk_custom_menu_item.h"
-#include "atom/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/event_utils.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
 #include "ui/base/accelerators/platform_accelerator_gtk.h"

+ 3 - 3
atom/browser/ui/gtk/menu_gtk.h → chrome/browser/ui/gtk/menu_gtk.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_GTK_MENU_GTK_H_
-#define ATOM_BROWSER_UI_GTK_MENU_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_MENU_GTK_H_
+#define CHROME_BROWSER_UI_GTK_MENU_GTK_H_
 
 #include <gtk/gtk.h>
 
@@ -221,4 +221,4 @@ class MenuGtk {
   base::WeakPtrFactory<MenuGtk> weak_factory_;
 };
 
-#endif  // ATOM_BROWSER_UI_GTK_MENU_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_MENU_GTK_H_