chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm - Issue 10830353: Introduce InfoBarTabService API.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

Issue 10830353: Introduce InfoBarTabService API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Respond to review comments, merge to LKGR Created 8 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 | « chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.mm ('k') | chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

index ef8cb2862df4a548275cea666c6aa2aeeec87588..86c6b510d63b464cde07a83e0aa165c8cf745b0f 100644

--- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

+++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

@@ -6,10 +6,10 @@

#include <cmath>

+#include "chrome/browser/api/infobars/infobar_tab_service.h"

#include "chrome/browser/extensions/extension_host.h"

#include "chrome/browser/extensions/extension_infobar_delegate.h"

#include "chrome/browser/extensions/image_loading_tracker.h"

-#include "chrome/browser/infobars/infobar_tab_helper.h"

#include "chrome/browser/ui/browser_finder.h"

#import "chrome/browser/ui/cocoa/animatable_view.h"

#import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"

@@ -140,7 +140,7 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,

@implementation ExtensionInfoBarController

- (id)initWithDelegate:(InfoBarDelegate*)delegate

- owner:(InfoBarTabHelper*)owner

+ owner:(InfoBarTabService*)owner

window:(NSWindow*)window {

if ((self = [super initWithDelegate:delegate owner:owner])) {

window_ = window;

@@ -150,7 +150,7 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,

extensions::ExtensionHost* extensionHost =

delegate_->AsExtensionInfoBarDelegate()->extension_host();

Browser* browser =

- browser::FindBrowserWithWebContents(owner->web_contents());

+ browser::FindBrowserWithWebContents(owner->GetWebContents());

contextMenu_.reset([[ExtensionActionContextMenu alloc]

initWithExtension:extensionHost->extension()

browser:browser

@@ -272,9 +272,9 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,

@end

-InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {

+InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarTabService* owner) {

NSWindow* window =

- [(NSView*)owner->web_contents()->GetContentNativeView() window];

+ [(NSView*)owner->GetWebContents()->GetContentNativeView() window];

ExtensionInfoBarController* controller =

[[ExtensionInfoBarController alloc] initWithDelegate:this

owner:owner