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

Unified Diff: chrome/browser/ui/views/frame/desktop_browser_frame_aura.h

Issue 11819008: Refactors building the system menu model into a common place (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk and fix windows build Created 7 years, 11 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: chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
index 3533a7806d25836f5113e10a791493aa6ec9abda..75cdc96be9726d84e6f9205f9ff9eaa1b84ed5cb 100644
--- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
+++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
@@ -16,7 +16,6 @@ class BrowserFrame;
class BrowserView;
namespace views {
-class MenuRunner;
namespace corewm {
class VisibilityController;
}
@@ -45,7 +44,7 @@ class DesktopBrowserFrameAura : public views::DesktopNativeWidgetAura,
// Overridden from NativeBrowserFrame:
virtual views::NativeWidget* AsNativeWidget() OVERRIDE;
virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;
- virtual void InitSystemContextMenu() OVERRIDE;
+ virtual bool UsesNativeSystemMenu() const OVERRIDE;
virtual int GetMinimizeButtonOffset() const OVERRIDE;
virtual void TabStripDisplayModeChanged() OVERRIDE;
@@ -59,9 +58,6 @@ class DesktopBrowserFrameAura : public views::DesktopNativeWidgetAura,
// Owned by the RootWindow.
BrowserDesktopRootWindowHost* browser_desktop_root_window_host_;
- // System menu.
- scoped_ptr<views::MenuRunner> menu_runner_;
-
scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_win.cc ('k') | chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698