chrome/browser/ui/views/toolbar/browser_actions_container.cc - Issue 670463004: Make a platform-independent ToolbarActionViewController

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_actions_container.cc

Issue 670463004: Make a platform-independent ToolbarActionViewController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/ui/extensions/extension_action_view_controller.h ('K') | « chrome/browser/ui/views/toolbar/browser_action_view.cc ('k') | chrome/browser/ui/views/toolbar/chevron_menu_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d00e9d99cf6e81947975d1b60641b6b95c16e945..01655c78270dd818050a83f9fdca15a7653ae22b 100644

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

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

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

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

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

#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"

-#include "chrome/browser/ui/views/extensions/extension_action_view_controller.h"

+#include "chrome/browser/ui/views/extensions/extension_action_view_controller_views.h"

#include "chrome/browser/ui/views/extensions/extension_popup.h"

#include "chrome/browser/ui/views/frame/browser_view.h"

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

@@ -61,7 +61,7 @@ ScopedVector<ToolbarActionViewController> GetToolbarActions(

extensions::ExtensionActionManager::Get(browser->profile());

const extensions::ExtensionList& toolbar_items = model->toolbar_items();

for (const scoped_refptr<const Extension>& extension : toolbar_items) {

- actions.push_back(new ExtensionActionViewController(

+ actions.push_back(new ExtensionActionViewControllerViews(

extension.get(),

browser,

action_manager->GetExtensionAction(*extension)));

@@ -767,7 +767,7 @@ void BrowserActionsContainer::ToolbarExtensionAdded(const Extension* extension,

// Add the new browser action to the vector and the view hierarchy.

BrowserActionView* view = new BrowserActionView(

- make_scoped_ptr(new ExtensionActionViewController(

+ make_scoped_ptr(new ExtensionActionViewControllerViews(

extension,

browser_,

extensions::ExtensionActionManager::Get(profile_)->