chrome/browser/ui/views/toolbar/browser_action_view.cc - Issue 288923004: Add an extension override bubble and warning box for proxy extensions.

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/toolbar/browser_action_view.cc

Issue 288923004: Add an extension override bubble and warning box for proxy extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tests Created 6 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/views/settings_api_bubble_helper_views.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/browser_action_view.cc

diff --git a/chrome/browser/ui/views/toolbar/browser_action_view.cc b/chrome/browser/ui/views/toolbar/browser_action_view.cc

index 650798891a4731cba70985112b3ac77567fa5a24..6c131166f3e5ef79508575492b039740fbe22465 100644

--- a/chrome/browser/ui/views/toolbar/browser_action_view.cc

+++ b/chrome/browser/ui/views/toolbar/browser_action_view.cc

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

#include "chrome/browser/themes/theme_service.h"

#include "chrome/browser/themes/theme_service_factory.h"

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

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

#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"

#include "chrome/browser/ui/views/toolbar/toolbar_view.h"

#include "extensions/common/extension.h"

@@ -51,6 +52,7 @@ BrowserActionView::BrowserActionView(const Extension* extension,

delegate_(delegate),

button_(NULL),

extension_(extension) {

+ set_id(VIEW_ID_BROWSER_ACTION);

button_ = new BrowserActionButton(extension_, browser_, delegate_);

button_->set_drag_controller(delegate_);

button_->set_owned_by_client();