diff --git a/atom.gyp b/atom.gyp index a6ca448d78d..70a70bcae4e 100644 --- a/atom.gyp +++ b/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', diff --git a/atom/browser/api/atom_api_menu_gtk.h b/atom/browser/api/atom_api_menu_gtk.h index 51c82d8daff..7b890579db3 100644 --- a/atom/browser/api/atom_api_menu_gtk.h +++ b/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 { diff --git a/atom/browser/native_window_gtk.cc b/atom/browser/native_window_gtk.cc index 34bdcb25b6a..3472eff1bbd 100644 --- a/atom/browser/native_window_gtk.cc +++ b/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" diff --git a/atom/browser/native_window_gtk.h b/atom/browser/native_window_gtk.h index 76da2856774..6700ee26d5e 100644 --- a/atom/browser/native_window_gtk.h +++ b/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" diff --git a/atom/browser/ui/file_dialog_gtk.cc b/atom/browser/ui/file_dialog_gtk.cc index b3ac3b975ef..d9cef0425ef 100644 --- a/atom/browser/ui/file_dialog_gtk.cc +++ b/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 { diff --git a/atom/browser/ui/message_box_gtk.cc b/atom/browser/ui/message_box_gtk.cc index 73447340bc3..7e4ffe4f957 100644 --- a/atom/browser/ui/message_box_gtk.cc +++ b/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 { diff --git a/atom/browser/ui/gtk/event_utils.cc b/chrome/browser/ui/gtk/event_utils.cc similarity index 96% rename from atom/browser/ui/gtk/event_utils.cc rename to chrome/browser/ui/gtk/event_utils.cc index 76c998a68f7..f61c1216567 100644 --- a/atom/browser/ui/gtk/event_utils.cc +++ b/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" diff --git a/atom/browser/ui/gtk/event_utils.h b/chrome/browser/ui/gtk/event_utils.h similarity index 100% rename from atom/browser/ui/gtk/event_utils.h rename to chrome/browser/ui/gtk/event_utils.h diff --git a/atom/browser/ui/gtk/gtk_custom_menu.cc b/chrome/browser/ui/gtk/gtk_custom_menu.cc similarity index 98% rename from atom/browser/ui/gtk/gtk_custom_menu.cc rename to chrome/browser/ui/gtk/gtk_custom_menu.cc index 6dc4c4ed96b..bfa5a97284d 100644 --- a/atom/browser/ui/gtk/gtk_custom_menu.cc +++ b/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) diff --git a/atom/browser/ui/gtk/gtk_custom_menu.h b/chrome/browser/ui/gtk/gtk_custom_menu.h similarity index 100% rename from atom/browser/ui/gtk/gtk_custom_menu.h rename to chrome/browser/ui/gtk/gtk_custom_menu.h diff --git a/atom/browser/ui/gtk/gtk_custom_menu_item.cc b/chrome/browser/ui/gtk/gtk_custom_menu_item.cc similarity index 99% rename from atom/browser/ui/gtk/gtk_custom_menu_item.cc rename to chrome/browser/ui/gtk/gtk_custom_menu_item.cc index b9c81581afb..2eda6010cea 100644 --- a/atom/browser/ui/gtk/gtk_custom_menu_item.cc +++ b/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 diff --git a/atom/browser/ui/gtk/gtk_custom_menu_item.h b/chrome/browser/ui/gtk/gtk_custom_menu_item.h similarity index 100% rename from atom/browser/ui/gtk/gtk_custom_menu_item.h rename to chrome/browser/ui/gtk/gtk_custom_menu_item.h diff --git a/atom/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc similarity index 98% rename from atom/browser/ui/gtk/gtk_util.cc rename to chrome/browser/ui/gtk/gtk_util.cc index 7db95dadf15..b24c375e2c1 100644 --- a/atom/browser/ui/gtk/gtk_util.cc +++ b/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 diff --git a/atom/browser/ui/gtk/gtk_util.h b/chrome/browser/ui/gtk/gtk_util.h similarity index 90% rename from atom/browser/ui/gtk/gtk_util.h rename to chrome/browser/ui/gtk/gtk_util.h index cc16b6f58b6..2434a386e78 100644 --- a/atom/browser/ui/gtk/gtk_util.h +++ b/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 #include @@ -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_ diff --git a/atom/browser/ui/gtk/gtk_window_util.cc b/chrome/browser/ui/gtk/gtk_window_util.cc similarity index 99% rename from atom/browser/ui/gtk/gtk_window_util.cc rename to chrome/browser/ui/gtk/gtk_window_util.cc index e68102c9d06..09d2624b5df 100644 --- a/atom/browser/ui/gtk/gtk_window_util.cc +++ b/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 #include "content/public/browser/render_view_host.h" diff --git a/atom/browser/ui/gtk/gtk_window_util.h b/chrome/browser/ui/gtk/gtk_window_util.h similarity index 95% rename from atom/browser/ui/gtk/gtk_window_util.h rename to chrome/browser/ui/gtk/gtk_window_util.h index 2234f38e264..d4904ca8e94 100644 --- a/atom/browser/ui/gtk/gtk_window_util.h +++ b/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 #include @@ -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_ diff --git a/atom/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc similarity index 99% rename from atom/browser/ui/gtk/menu_gtk.cc rename to chrome/browser/ui/gtk/menu_gtk.cc index c3d32dbccd1..1fde1ba39b1 100644 --- a/atom/browser/ui/gtk/menu_gtk.cc +++ b/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 @@ -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" diff --git a/atom/browser/ui/gtk/menu_gtk.h b/chrome/browser/ui/gtk/menu_gtk.h similarity index 98% rename from atom/browser/ui/gtk/menu_gtk.h rename to chrome/browser/ui/gtk/menu_gtk.h index 45d073fd1ae..50ef2c9c29f 100644 --- a/atom/browser/ui/gtk/menu_gtk.h +++ b/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 @@ -221,4 +221,4 @@ class MenuGtk { base::WeakPtrFactory weak_factory_; }; -#endif // ATOM_BROWSER_UI_GTK_MENU_GTK_H_ +#endif // CHROME_BROWSER_UI_GTK_MENU_GTK_H_