chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm - Issue 10534093: TabContentsWrapper -> TabContents, part 37.

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/extensions/extension_installed_bubble_bridge.mm

Issue 10534093: TabContentsWrapper -> TabContents, part 37. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm ('k') | chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm

index a19bee41997396d5b1641ce7cdb75d7a258ec6f3..2f21dfab8dcc9785db486462260cbd6faac10e2a 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm

@@ -15,7 +15,7 @@

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

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

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

-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

+#include "chrome/browser/ui/tab_contents/tab_contents.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_action.h"

#include "grit/chromium_strings.h"

@@ -35,8 +35,8 @@ static void ShowGenericExtensionInstalledInfoBar(

if (!browser)

return;

- TabContentsWrapper* wrapper = browser->GetSelectedTabContentsWrapper();

- if (!wrapper)

+ TabContents* tab_contents = browser->GetActiveTabContents();

+ if (!tab_contents)

return;

string16 extension_name = UTF8ToUTF16(new_extension->name());

@@ -46,7 +46,7 @@ static void ShowGenericExtensionInstalledInfoBar(

+ UTF8ToUTF16(" ")

+ l10n_util::GetStringUTF16(

IDS_EXTENSION_INSTALLED_MANAGE_INFO_MAC);

- InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper();

+ InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();

InfoBarDelegate* delegate = new SimpleAlertInfoBarDelegate(

infobar_helper, new gfx::Image(icon), msg, true);

infobar_helper->AddInfoBar(delegate);