Renamed the DBus appmenu classes appropriately.

This is a follow-up to [1] that fixes one compilation issue and also
renames the classes and files so they would match the purpose better.

No changes to functionality are intended.

[1] https://crrev.com/c/2289772

Bug: 990756
Change-Id: Ifffe052bff2d6bfcad81ce5fe38e6e5ad37dcb8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317185
Auto-Submit: Alexander Dunaev <adunaev@igalia.com>
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791382}

chrome/browser/ui/BUILD.gn

@@ -3072,10 +3072,10 @@ static_library("ui") {
 
     if (use_dbus && (use_x11 || ozone_platform_x11)) {
       sources += [
-        "views/frame/global_menu_bar_registrar_x11.cc",
-        "views/frame/global_menu_bar_registrar_x11.h",
-        "views/frame/global_menu_bar_x11.cc",
-        "views/frame/global_menu_bar_x11.h",
+        "views/frame/dbus_appmenu.cc",
+        "views/frame/dbus_appmenu.h",
+        "views/frame/dbus_appmenu_registrar.cc",
+        "views/frame/dbus_appmenu_registrar.h",
       ]
       defines += [ "USE_DBUS_MENU" ]
       deps += [ "//ui/gfx/x" ]

chrome/browser/ui/views/frame/DEPS

@@ -6,7 +6,7 @@ specific_include_rules = {
   "browser_frame_ash\.*": [
     "+ash",
   ],
-  "global_menu_bar_.*x11\.*": [
+  "dbus_appmenu\.*": [
     "+dbus",
   ],
   "top_controls_slide_controller_chromeos_browsertest.cc": [

chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc

@@ -17,6 +17,8 @@
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/platform_window/extensions/x11_extension.h"
 
+#if defined(USE_DBUS_MENU)
+
 namespace {
 
 #if defined(USE_DBUS_MENU)
@@ -33,6 +35,8 @@ bool CreateGlobalMenuBar() {
 
 }  // namespace
 
+#endif  // defined(USE_DBUS_MENU)
+
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserDesktopWindowTreeHostLinux, public:
 
@@ -96,17 +100,16 @@ void BrowserDesktopWindowTreeHostLinux::Init(
 #if defined(USE_DBUS_MENU)
   // We have now created our backing X11 window.  We now need to (possibly)
   // alert the desktop environment that there's a menu bar attached to it.
-
   if (CreateGlobalMenuBar()) {
-    global_menu_bar_x11_ = std::make_unique<GlobalMenuBarX11>(
-        browser_view_, GetAcceleratedWidget());
+    dbus_appmenu_ =
+        std::make_unique<DbusAppmenu>(browser_view_, GetAcceleratedWidget());
   }
 #endif
 }
 
 void BrowserDesktopWindowTreeHostLinux::CloseNow() {
 #if defined(USE_DBUS_MENU)
-  global_menu_bar_x11_.reset();
+  dbus_appmenu_.reset();
 #endif
   DesktopWindowTreeHostLinuxImpl::CloseNow();
 }

chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h

@@ -9,7 +9,7 @@
 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h"
 
 #if defined(USE_DBUS_MENU)
-#include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"  // nogncheck
+#include "chrome/browser/ui/views/frame/dbus_appmenu.h"  // nogncheck
 #endif
 
 #if defined(USE_X11)
@@ -70,7 +70,7 @@ class BrowserDesktopWindowTreeHostLinux
   // Each browser frame maintains its own menu bar object because the lower
   // level dbus protocol associates a xid to a menu bar; we can't map multiple
   // xids to the same menu bar.
-  std::unique_ptr<GlobalMenuBarX11> global_menu_bar_x11_;
+  std::unique_ptr<DbusAppmenu> dbus_appmenu_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserDesktopWindowTreeHostLinux);

chrome/browser/ui/views/frame/global_menu_bar_x11.h → chrome/browser/ui/views/frame/dbus_appmenu.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_X11_H_
-#define CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DBUS_APPMENU_H_
+#define CHROME_BROWSER_UI_VIEWS_FRAME_DBUS_APPMENU_H_
 
 #include <map>
 #include <string>
@@ -33,7 +33,7 @@ class Accelerator;
 
 class Browser;
 class BrowserView;
-struct GlobalMenuBarCommand;
+struct DbusAppmenuCommand;
 class Profile;
 
 // Controls the Mac style menu bar on Linux desktop environments.
@@ -42,22 +42,22 @@ class Profile;
 // depending on the active window.  Unity has been discontinued but the menu
 // survived and is usually referred to as DBus AppMenu.  There is support for it
 // in KDE Plasma in form of a widget that can be inserted into a panel.
-class GlobalMenuBarX11 : public AvatarMenuObserver,
-                         public BrowserListObserver,
-                         public CommandObserver,
-                         public history::TopSitesObserver,
-                         public sessions::TabRestoreServiceObserver,
-                         public ui::SimpleMenuModel::Delegate {
+class DbusAppmenu : public AvatarMenuObserver,
+                    public BrowserListObserver,
+                    public CommandObserver,
+                    public history::TopSitesObserver,
+                    public sessions::TabRestoreServiceObserver,
+                    public ui::SimpleMenuModel::Delegate {
  public:
-  GlobalMenuBarX11(BrowserView* browser_view, uint32_t browser_frame_xid);
-  ~GlobalMenuBarX11() override;
+  DbusAppmenu(BrowserView* browser_view, uint32_t browser_frame_id);
+  ~DbusAppmenu() override;
 
   void Initialize(DbusMenu::InitializedCallback callback);
 
   // Creates the object path for DbusemenuServer which is attached to |window|.
   std::string GetPath() const;
 
-  uint32_t browser_frame_xid() const { return browser_frame_xid_; }
+  uint32_t browser_frame_id() const { return browser_frame_id_; }
 
  private:
   struct HistoryItem;
@@ -65,7 +65,7 @@ class GlobalMenuBarX11 : public AvatarMenuObserver,
   // Creates a whole menu defined with |commands| and titled with the string
   // |string_id|. Then appends it to |root_menu_|.
   ui::SimpleMenuModel* BuildStaticMenu(int string_id,
-                                       const GlobalMenuBarCommand* commands);
+                                       const DbusAppmenuCommand* commands);
 
   // Creates a HistoryItem from the data in |entry|.
   std::unique_ptr<HistoryItem> HistoryItemForTab(
@@ -134,8 +134,8 @@ class GlobalMenuBarX11 : public AvatarMenuObserver,
   // as plain int (and not as x11::Window) because it is never used for any
   // calls to the X server, but it is always used for building string paths and
   // messages, for which it is converted to int (see GetPath() and calls to our
-  // browser_frame_xid() in GlobalMenuBarRegistrarX11).
-  const uint32_t browser_frame_xid_;
+  // browser_frame_id() in DbusAppmenuRegistrar).
+  const uint32_t browser_frame_id_;
 
   // Has Initialize() been called?
   bool initialized_ = false;
@@ -179,9 +179,9 @@ class GlobalMenuBarX11 : public AvatarMenuObserver,
   int last_command_id_;
 
   // For callbacks may be run after destruction.
-  base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_{this};
+  base::WeakPtrFactory<DbusAppmenu> weak_ptr_factory_{this};
 
-  DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11);
+  DISALLOW_COPY_AND_ASSIGN(DbusAppmenu);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_DBUS_APPMENU_H_

chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc → chrome/browser/ui/views/frame/dbus_appmenu_registrar.cc

@@ -2,14 +2,14 @@
 // 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 "chrome/browser/ui/views/frame/dbus_appmenu_registrar.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/check_op.h"
 #include "base/notreached.h"
 #include "base/stl_util.h"
-#include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"
+#include "chrome/browser/ui/views/frame/dbus_appmenu.h"
 #include "components/dbus/thread_linux/dbus_thread_linux.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
@@ -25,11 +25,11 @@ const char kAppMenuRegistrarInterface[] = "com.canonical.AppMenu.Registrar";
 }  // namespace
 
 // static
-GlobalMenuBarRegistrarX11* GlobalMenuBarRegistrarX11::GetInstance() {
-  return base::Singleton<GlobalMenuBarRegistrarX11>::get();
+DbusAppmenuRegistrar* DbusAppmenuRegistrar::GetInstance() {
+  return base::Singleton<DbusAppmenuRegistrar>::get();
 }
 
-void GlobalMenuBarRegistrarX11::OnMenuBarCreated(GlobalMenuBarX11* menu) {
+void DbusAppmenuRegistrar::OnMenuBarCreated(DbusAppmenu* menu) {
   if (base::Contains(menus_, menu)) {
     NOTREACHED();
     return;
@@ -39,13 +39,13 @@ void GlobalMenuBarRegistrarX11::OnMenuBarCreated(GlobalMenuBarX11* menu) {
     InitializeMenu(menu);
 }
 
-void GlobalMenuBarRegistrarX11::OnMenuBarDestroyed(GlobalMenuBarX11* menu) {
+void DbusAppmenuRegistrar::OnMenuBarDestroyed(DbusAppmenu* menu) {
   DCHECK(base::Contains(menus_, menu));
   if (menus_[menu] == kRegistered) {
     dbus::MethodCall method_call(kAppMenuRegistrarInterface,
                                  "UnregisterWindow");
     dbus::MessageWriter writer(&method_call);
-    writer.AppendUint32(menu->browser_frame_xid());
+    writer.AppendUint32(menu->browser_frame_id());
     registrar_proxy_->CallMethod(&method_call,
                                  dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                                  base::DoNothing());
@@ -53,7 +53,7 @@ void GlobalMenuBarRegistrarX11::OnMenuBarDestroyed(GlobalMenuBarX11* menu) {
   menus_.erase(menu);
 }
 
-GlobalMenuBarRegistrarX11::GlobalMenuBarRegistrarX11() {
+DbusAppmenuRegistrar::DbusAppmenuRegistrar() {
   dbus::Bus::Options bus_options;
   bus_options.bus_type = dbus::Bus::SESSION;
   bus_options.connection_type = dbus::Bus::PRIVATE;
@@ -64,40 +64,39 @@ GlobalMenuBarRegistrarX11::GlobalMenuBarRegistrarX11() {
       kAppMenuRegistrarName, dbus::ObjectPath(kAppMenuRegistrarPath));
 
   dbus::Bus::ServiceOwnerChangeCallback callback =
-      base::BindRepeating(&GlobalMenuBarRegistrarX11::OnNameOwnerChanged,
+      base::BindRepeating(&DbusAppmenuRegistrar::OnNameOwnerChanged,
                           weak_ptr_factory_.GetWeakPtr());
   bus_->ListenForServiceOwnerChange(kAppMenuRegistrarName, callback);
   bus_->GetServiceOwner(kAppMenuRegistrarName, callback);
 }
 
-GlobalMenuBarRegistrarX11::~GlobalMenuBarRegistrarX11() {
+DbusAppmenuRegistrar::~DbusAppmenuRegistrar() {
   DCHECK(menus_.empty());
   bus_->GetDBusTaskRunner()->PostTask(
       FROM_HERE, base::BindOnce(&dbus::Bus::ShutdownAndBlock, bus_));
 }
 
-void GlobalMenuBarRegistrarX11::InitializeMenu(GlobalMenuBarX11* menu) {
+void DbusAppmenuRegistrar::InitializeMenu(DbusAppmenu* menu) {
   DCHECK(base::Contains(menus_, menu));
   DCHECK_EQ(menus_[menu], kUninitialized);
   menus_[menu] = kInitializing;
-  menu->Initialize(base::BindOnce(&GlobalMenuBarRegistrarX11::OnMenuInitialized,
+  menu->Initialize(base::BindOnce(&DbusAppmenuRegistrar::OnMenuInitialized,
                                   weak_ptr_factory_.GetWeakPtr(), menu));
 }
 
-void GlobalMenuBarRegistrarX11::RegisterMenu(GlobalMenuBarX11* menu) {
+void DbusAppmenuRegistrar::RegisterMenu(DbusAppmenu* menu) {
   DCHECK(base::Contains(menus_, menu));
   DCHECK(menus_[menu] == kInitializeSucceeded || menus_[menu] == kRegistered);
   menus_[menu] = kRegistered;
   dbus::MethodCall method_call(kAppMenuRegistrarInterface, "RegisterWindow");
   dbus::MessageWriter writer(&method_call);
-  writer.AppendUint32(menu->browser_frame_xid());
+  writer.AppendUint32(menu->browser_frame_id());
   writer.AppendObjectPath(dbus::ObjectPath(menu->GetPath()));
   registrar_proxy_->CallMethod(
       &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, base::DoNothing());
 }
 
-void GlobalMenuBarRegistrarX11::OnMenuInitialized(GlobalMenuBarX11* menu,
-                                                  bool success) {
+void DbusAppmenuRegistrar::OnMenuInitialized(DbusAppmenu* menu, bool success) {
   DCHECK(base::Contains(menus_, menu));
   DCHECK(menus_[menu] == kInitializing);
   menus_[menu] = success ? kInitializeSucceeded : kInitializeFailed;
@@ -105,14 +104,14 @@ void GlobalMenuBarRegistrarX11::OnMenuInitialized(GlobalMenuBarX11* menu,
     RegisterMenu(menu);
 }
 
-void GlobalMenuBarRegistrarX11::OnNameOwnerChanged(
+void DbusAppmenuRegistrar::OnNameOwnerChanged(
     const std::string& service_owner) {
   service_has_owner_ = !service_owner.empty();
 
   // If the name owner changed, we need to reregister all the live menus with
   // the system.
   for (const auto& pair : menus_) {
-    GlobalMenuBarX11* menu = pair.first;
+    DbusAppmenu* menu = pair.first;
     switch (pair.second) {
       case kUninitialized:
         if (service_has_owner_)

chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h → chrome/browser/ui/views/frame/dbus_appmenu_registrar.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 CHROME_BROWSER_UI_VIEWS_FRAME_DBUS_APPMENU_REGISTRAR_H_
+#define CHROME_BROWSER_UI_VIEWS_FRAME_DBUS_APPMENU_REGISTRAR_H_
 
 #include <map>
 #include <string>
@@ -18,25 +18,25 @@ class Bus;
 class ObjectProxy;
 }  // namespace dbus
 
-class GlobalMenuBarX11;
+class DbusAppmenu;
 
 // Advertises our menu bars to com.canonical.AppMenu.Registrar.
 //
-// GlobalMenuBarRegistrarX11 is responsible for managing the dbus::Bus shared by
+// DbusAppmenuRegistrar is responsible for managing the dbus::Bus shared by
 // each menu. We need a separate object to own the dbus channel and to
 // register/unregister the mapping between a menu and the com.canonical.dbusmenu
 // instance we are offering.
-class GlobalMenuBarRegistrarX11 {
+class DbusAppmenuRegistrar {
  public:
-  static GlobalMenuBarRegistrarX11* GetInstance();
+  static DbusAppmenuRegistrar* GetInstance();
 
-  void OnMenuBarCreated(GlobalMenuBarX11* menu);
-  void OnMenuBarDestroyed(GlobalMenuBarX11* menu);
+  void OnMenuBarCreated(DbusAppmenu* menu);
+  void OnMenuBarDestroyed(DbusAppmenu* menu);
 
   dbus::Bus* bus() { return bus_.get(); }
 
  private:
-  friend struct base::DefaultSingletonTraits<GlobalMenuBarRegistrarX11>;
+  friend struct base::DefaultSingletonTraits<DbusAppmenuRegistrar>;
 
   enum MenuState {
     // Initialize() hasn't been called.
@@ -56,15 +56,15 @@ class GlobalMenuBarRegistrarX11 {
     kRegistered,
   };
 
-  GlobalMenuBarRegistrarX11();
-  ~GlobalMenuBarRegistrarX11();
+  DbusAppmenuRegistrar();
+  ~DbusAppmenuRegistrar();
 
-  void InitializeMenu(GlobalMenuBarX11* menu);
+  void InitializeMenu(DbusAppmenu* menu);
 
   // Sends the actual message.
-  void RegisterMenu(GlobalMenuBarX11* menu);
+  void RegisterMenu(DbusAppmenu* menu);
 
-  void OnMenuInitialized(GlobalMenuBarX11* menu, bool success);
+  void OnMenuInitialized(DbusAppmenu* menu, bool success);
 
   void OnNameOwnerChanged(const std::string& service_owner);
 
@@ -74,11 +74,11 @@ class GlobalMenuBarRegistrarX11 {
 
   // Maps menus to flags that indicate if the menu has been successfully
   // initialized.
-  std::map<GlobalMenuBarX11*, MenuState> menus_;
+  std::map<DbusAppmenu*, MenuState> menus_;
 
-  base::WeakPtrFactory<GlobalMenuBarRegistrarX11> weak_ptr_factory_{this};
+  base::WeakPtrFactory<DbusAppmenuRegistrar> weak_ptr_factory_{this};
 
-  DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarRegistrarX11);
+  DISALLOW_COPY_AND_ASSIGN(DbusAppmenuRegistrar);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_REGISTRAR_X11_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_DBUS_APPMENU_REGISTRAR_H_

components/prefs/pref_notifier_impl.cc

@@ -45,7 +45,7 @@ PrefNotifierImpl::~PrefNotifierImpl() {
       // preferences which are known to have subscriptions outliving the
       // profile.
       if (
-          // For GlobalMenuBarX11, crbug.com/946668
+          // For DbusAppmenu, crbug.com/946668
           pref_name == "bookmark_bar.show_on_all_tabs" ||
           // For BrowserWindowPropertyManager, crbug.com/942491
           pref_name == "profile.icon_version" ||

tools/cfi/blacklist.txt

@@ -181,8 +181,8 @@ src:*ui/gtk/unity_service.cc
 src:*components/cronet/native/*
 src:*third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
 
-# chrome/browser/ui/views/frame/global_menu_bar_x11.cc
-fun:*GlobalMenuBarX11*
+# chrome/browser/ui/views/frame/dbus_appmenu.cc
+fun:*dbus_appmenu*
 
 # third_party/skia/include/gpu/gl/GrGLFunctions.h
 fun:*GrGLFunction*