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

Unified Diff: chrome/browser/cocoa/extensions/extension_action_context_menu.mm

Issue 2973003: [Mac] Finish up extension infobar UI implementation. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 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/extensions/extension_action_context_menu.mm
===================================================================
--- chrome/browser/cocoa/extensions/extension_action_context_menu.mm (revision 52101)
+++ chrome/browser/cocoa/extensions/extension_action_context_menu.mm (working copy)
@@ -243,6 +243,7 @@
(AutocompleteTextField*)locationBar->location_entry()->
GetNativeView();
AutocompleteTextFieldCell* fieldCell = [field autocompleteTextFieldCell];
+ DCHECK(action_);
NSRect popupRect =
[fieldCell pageActionFrameForExtensionAction:action_
inFrame:[field bounds]];
@@ -276,8 +277,8 @@
}
- (BOOL)validateMenuItem:(NSMenuItem*)menuItem {
- if([menuItem isEqualTo: inspectorItem_.get()]) {
- return (action_->HasPopup(CurrentTabId()));
+ if([menuItem isEqualTo:inspectorItem_.get()]) {
+ return action_ && action_->HasPopup(CurrentTabId());
}
return YES;
}

Powered by Google App Engine
This is Rietveld 408576698