chrome/browser/ui/gtk/location_bar_view_gtk.cc - Issue 10827268: Added flag --extensions-in-action-box to split Action Box and Extensions in it.

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/gtk/location_bar_view_gtk.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/cocoa/location_bar/location_bar_view_mac.mm ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc

diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

index 3c5d6ef1737bbf80b94bde1e17974ead94d115ce..601a276ad1a97dc880c4ad58057f8978a8eb544c 100644

--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc

+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

@@ -67,6 +67,7 @@

#include "chrome/browser/ui/webui/extensions/extension_info_ui.h"

#include "chrome/browser/ui/zoom/zoom_controller.h"

#include "chrome/common/chrome_notification_types.h"

+#include "chrome/common/chrome_switches.h"

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

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

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

@@ -471,7 +472,7 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {

// doesn't work, someone is probably calling show_all on our parent box.

gtk_box_pack_end(GTK_BOX(entry_box_), tab_to_search_hint_, FALSE, FALSE, 0);

- if (extensions::switch_utils::IsActionBoxEnabled()) {

+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableActionBox)) {

// TODO(mpcomplete): should we hide this if ShouldOnlyShowLocation()==true?

action_box_button_.reset(new ActionBoxButtonGtk(browser_));