chrome/browser/extensions/extension_toolbar_model.cc - Issue 10378117: With enable-action-box add extensions to BrowserActionContainer only if they have preference kBrows…

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/extensions/extension_toolbar_model.cc

Issue 10378117: With enable-action-box add extensions to BrowserActionContainer only if they have preference kBrows… (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

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

« chrome/browser/extensions/extension_prefs.cc ('K') | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_toolbar_model.cc

===================================================================

--- chrome/browser/extensions/extension_toolbar_model.cc (revision 136343)

+++ chrome/browser/extensions/extension_toolbar_model.cc (working copy)

@@ -28,7 +28,7 @@

registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,

content::Source<Profile>(service_->profile()));

registrar_.Add(

- this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,

+ this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_PINED_CHANGED,

content::Source<ExtensionPrefs>(service_->extension_prefs()));

visible_icon_count_ = prefs_->GetInteger(prefs::kExtensionToolbarSize);

@@ -113,14 +113,14 @@

if (toolitems_[i].get() == extension)

return; // Already exists.

}

- if (service_->GetBrowserActionVisibility(extension))

+ if (service_->extension_prefs()->GetBrowserActionPined(extension))

AddExtension(extension);

} else if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED) {

RemoveExtension(extension);

} else if (

type ==

- chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED) {

- if (service_->GetBrowserActionVisibility(extension))

+ chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_PINED_CHANGED) {

+ if (service_->extension_prefs()->GetBrowserActionPined(extension))

AddExtension(extension);

else

RemoveExtension(extension);

@@ -192,7 +192,7 @@

const Extension* extension = *it;

if (!extension->browser_action())

continue;

- if (!service_->GetBrowserActionVisibility(extension))

+ if (!service_->extension_prefs()->GetBrowserActionPined(extension))

continue;

std::vector<std::string>::iterator pos =