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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 10827268: Added flag --extensions-in-action-box to split Action Box and Extensions in it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed IsActionBoxEnabled() 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/gtk/location_bar_view_gtk.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 4d16bc5033a25c712b7784a7aabff5084053e3fb..460529242abab17f38f1272595c74c87f299aec1 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -275,7 +275,8 @@ void LocationBarView::Init(views::View* popup_parent_view) {
zoom_view_ = new ZoomView(model_, delegate_);
AddChildView(zoom_view_);
- if (extensions::switch_utils::IsActionBoxEnabled() && browser_) {
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableActionBox) &&
+ browser_) {
action_box_button_view_ = new ActionBoxButtonView(browser_, profile_);
AddChildView(action_box_button_view_);
} else if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) {
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698