diff --git a/filenames.gni b/filenames.gni index 2d43873bbb8..7ac65a09034 100644 --- a/filenames.gni +++ b/filenames.gni @@ -44,8 +44,8 @@ filenames = { ] lib_sources_linux_x11 = [ - "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc", - "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h", + "shell/browser/ui/views/global_menu_bar_registrar_x11.cc", + "shell/browser/ui/views/global_menu_bar_registrar_x11.h", "shell/browser/ui/views/global_menu_bar_x11.cc", "shell/browser/ui/views/global_menu_bar_x11.h", "shell/browser/ui/x/event_disabler.cc", diff --git a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc b/shell/browser/ui/views/global_menu_bar_registrar_x11.cc similarity index 97% rename from chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc rename to shell/browser/ui/views/global_menu_bar_registrar_x11.cc index 8a07829b2e2..3e20af389a7 100644 --- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc +++ b/shell/browser/ui/views/global_menu_bar_registrar_x11.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h" +#include "shell/browser/ui/views/global_menu_bar_registrar_x11.h" + +#include #include "base/bind.h" #include "base/debug/leak_annotations.h" @@ -49,7 +51,7 @@ GlobalMenuBarRegistrarX11::GlobalMenuBarRegistrarX11() { G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START), nullptr, kAppMenuRegistrarName, kAppMenuRegistrarPath, kAppMenuRegistrarName, - nullptr, // TODO: Probalby want a real cancelable. + nullptr, // Probably want a real cancelable. static_cast(OnProxyCreatedThunk), this); } diff --git a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h b/shell/browser/ui/views/global_menu_bar_registrar_x11.h similarity index 89% rename from chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h rename to shell/browser/ui/views/global_menu_bar_registrar_x11.h index 58990429028..ac4b9025c62 100644 --- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h +++ b/shell/browser/ui/views/global_menu_bar_registrar_x11.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 CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_REGISTRAR_X11_H_ -#define CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_REGISTRAR_X11_H_ +#ifndef SHELL_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_REGISTRAR_X11_H_ +#define SHELL_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_REGISTRAR_X11_H_ #include @@ -57,4 +57,4 @@ class GlobalMenuBarRegistrarX11 { DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarRegistrarX11); }; -#endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_REGISTRAR_X11_H_ +#endif // SHELL_BROWSER_UI_VIEWS_GLOBAL_MENU_BAR_REGISTRAR_X11_H_ diff --git a/shell/browser/ui/views/global_menu_bar_x11.cc b/shell/browser/ui/views/global_menu_bar_x11.cc index 63cdffcf4e9..27f90b94b46 100644 --- a/shell/browser/ui/views/global_menu_bar_x11.cc +++ b/shell/browser/ui/views/global_menu_bar_x11.cc @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h" #include "shell/browser/native_window_views.h" #include "shell/browser/ui/electron_menu_model.h" +#include "shell/browser/ui/views/global_menu_bar_registrar_x11.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/accelerators/menu_label_accelerator_util_linux.h"