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

Unified Diff: chrome/browser/app_controller_mac.h

Issue 22867009: Swap main menu with app-specific menu when app window focused. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix gypi 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
« no previous file with comments | « no previous file | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac.h
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h
index 46d8a051f3328c97b1c4c7ab344bd5879ebd9835..bc10cd2b94f0605ee1e39fcd3090f902863bdace 100644
--- a/chrome/browser/app_controller_mac.h
+++ b/chrome/browser/app_controller_mac.h
@@ -17,6 +17,7 @@
#include "ui/base/work_area_watcher_observer.h"
class AppControllerProfileObserver;
+@class AppShimMenuController;
class BookmarkMenuBridge;
class CommandUpdater;
class GURL;
@@ -49,6 +50,9 @@ class WorkAreaWatcherObserver;
scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_;
scoped_ptr<HistoryMenuBridge> historyMenuBridge_;
+ // Controller that manages main menu items for packaged apps.
+ base::scoped_nsobject<AppShimMenuController> appShimMenuController_;
+
// The profile menu, which appears right before the Help menu. It is only
// available when multiple profiles is enabled.
base::scoped_nsobject<ProfileMenuController> profileMenuController_;
« no previous file with comments | « no previous file | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698