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

Unified Diff: chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm

Issue 164547: Mac: make save/open dialogs operate as tab-modal sheets.... Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Painfully (but hopefully correctly) merged ToT. Created 11 years, 2 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/cocoa/bookmark_menu_cocoa_controller.mm
diff --git a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
index f053da71395f4c9b46c76923acc7d4b33449eacd..0ce9fbd104a9ebb1d946dc833030907f3e1406ae 100644
--- a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
+++ b/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm
@@ -4,8 +4,10 @@
#include "app/gfx/text_elider.h"
#include "base/sys_string_conversions.h"
+#include "chrome/app/chrome_dll_resource.h" // IDC_*
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_list.h"
#import "chrome/browser/cocoa/bookmark_menu_bridge.h"
#import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
#include "chrome/browser/cocoa/event_utils.h"
@@ -69,5 +71,13 @@ const NSUInteger kMaximumMenuPixelsWide = 300;
[self openURLForNode:node];
}
-@end // BookmarkMenuCocoaController
+- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
+ if (Browser* browser = BrowserList::GetLastActive()) {
+ return browser->command_updater()->IsCommandEnabled(
+ IDC_BOOKMARK_MENU_CONTENTS) ? YES : NO;
+ }
+ // Enable bookmarks when there's no browser window.
+ return YES;
+}
+@end // BookmarkMenuCocoaController
« no previous file with comments | « chrome/browser/cocoa/bookmark_bar_controller_unittest.mm ('k') | chrome/browser/cocoa/browser_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698