Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: trunk/src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h

Issue 22326003: Revert 215769 "linux_aura: Implement the static part of the dbus..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h
===================================================================
--- trunk/src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h (revision 215779)
+++ trunk/src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h (working copy)
@@ -1,54 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// 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_
-
-#include <gio/gio.h>
-
-#include <set>
-
-#include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/singleton.h"
-#include "ui/base/glib/glib_signal.h"
-
-// Advertises our menu bars to Unity.
-//
-// GlobalMenuBarX11 is responsible for managing the DbusmenuServer for each
-// XID. We need a separate object to own the dbus channel to
-// com.canonical.AppMenu.Registrar and to register/unregister the mapping
-// between a XID and the DbusmenuServer instance we are offering.
-class GlobalMenuBarRegistrarX11 {
- public:
- static GlobalMenuBarRegistrarX11* GetInstance();
-
- void OnWindowMapped(unsigned long xid);
- void OnWindowUnmapped(unsigned long xid);
-
- private:
- friend struct DefaultSingletonTraits<GlobalMenuBarRegistrarX11>;
-
- GlobalMenuBarRegistrarX11();
- ~GlobalMenuBarRegistrarX11();
-
- // Sends the actual message.
- void RegisterXID(unsigned long xid);
- void UnregisterXID(unsigned long xid);
-
- CHROMEG_CALLBACK_1(GlobalMenuBarRegistrarX11, void, OnProxyCreated,
- GObject*, GAsyncResult*);
- CHROMEG_CALLBACK_1(GlobalMenuBarRegistrarX11, void, OnNameOwnerChanged,
- GObject*, GParamSpec*);
-
- GDBusProxy* registrar_proxy_;
-
- // Window XIDs which want to be registered, but haven't yet been because
- // we're waiting for the proxy to become available.
- std::set<unsigned long> live_xids_;
-
- DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarRegistrarX11);
-};
-
-#endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_REGISTRAR_X11_H_

Powered by Google App Engine
This is Rietveld 408576698