chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc - Issue 10375021: Move Extension into extensions namespace

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/views/ash/launcher/browser_launcher_item_controller.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Take 6 Created 8 years, 7 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/views/ash/extension_utils.cc ('k') | chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc

diff --git a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc

index 3563c3cc5769c40d60407d202c47b6d932ee29c2..6fba79012060e01f80dd4f79d11560a45a6c1fb0 100644

--- a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc

+++ b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc

@@ -188,7 +188,7 @@ void BrowserLauncherItemController::UpdateLauncher(TabContentsWrapper* tab) {

if (!new_image.empty())

item.image = new_image;

else if (item.image.empty())

- item.image = Extension::GetDefaultIcon(true);

+ item.image = extensions::Extension::GetDefaultIcon(true);

} else {

DCHECK_EQ(TYPE_TABBED, type_);

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();