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

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

Issue 2858028: [Mac] Base implementation of extension infobars on the mac.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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_popup_controller.mm
===================================================================
--- chrome/browser/cocoa/extensions/extension_popup_controller.mm (revision 50982)
+++ chrome/browser/cocoa/extensions/extension_popup_controller.mm (working copy)
@@ -42,14 +42,12 @@
const NotificationDetails& details) {
switch (type.value) {
case NotificationType::EXTENSION_HOST_DID_STOP_LOADING: {
- if (Details<ExtensionHost>([controller_ extensionHost]) ==
- details)
+ if (Details<ExtensionHost>([controller_ extensionHost]) == details)
[controller_ showDevTools];
break;
}
case NotificationType::DEVTOOLS_WINDOW_CLOSING: {
- RenderViewHost* rvh =
- [controller_ extensionHost]->render_view_host();
+ RenderViewHost* rvh = [controller_ extensionHost]->render_view_host();
if (Details<RenderViewHost>(rvh) == details)
// Allow the devtools to finish detaching before we close the popup
[controller_ performSelector:@selector(close)
@@ -92,6 +90,7 @@
parentWindow_ = parentWindow;
anchor_ = [parentWindow convertBaseToScreen:anchoredAt];
host_.reset(host);
+ beingInspected_ = devMode;
scoped_nsobject<InfoBubbleView> view([[InfoBubbleView alloc] init]);
if (!view.get())
@@ -127,8 +126,7 @@
[window setDelegate:self];
[window setContentView:view];
self = [super initWithWindow:window];
- if (devMode) {
- beingInspected_ = true;
+ if (beingInspected_) {
// Listen for the the devtools window closing.
notificationBridge_.reset(new DevtoolsNotificationBridge(self));
registrar_.reset(new NotificationRegistrar);
@@ -138,15 +136,12 @@
registrar_->Add(notificationBridge_.get(),
NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
Source<Profile>(host->profile()));
- } else {
- beingInspected_ = false;
}
return self;
}
- (void)showDevTools {
- DevToolsManager::GetInstance()->OpenDevToolsWindow(
- host_->render_view_host());
+ DevToolsManager::GetInstance()->OpenDevToolsWindow(host_->render_view_host());
}
- (void)dealloc {
« no previous file with comments | « chrome/browser/cocoa/extensions/extension_popup_controller.h ('k') | chrome/browser/cocoa/infobar_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698