chrome/browser/ui/toolbar/component_toolbar_actions_factory.h - Issue 1495653003: [Media Router] Check MediaRouterDialogControllerImpl only sets toolbar MediaRouterAction.

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/toolbar/component_toolbar_actions_factory.h

Issue 1495653003: [Media Router] Check MediaRouterDialogControllerImpl only sets toolbar MediaRouterAction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes per pkasting@'s comments. Fixed OSX segfaults. Created 5 years 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

Index: chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

index f8fa607ad39b1fa54eb34071e889b3cf3ceeb6c2..66b9d5bc8a8005f56a8e92de4ef28fe646566130 100644

--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

@@ -10,6 +10,7 @@

#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"

class Browser;

class Profile;

@@ -34,7 +35,8 @@ class ComponentToolbarActionsFactory {

// Returns a collection of controllers for component actions. Declared

// virtual for testing.

virtual scoped_ptr<ToolbarActionViewController>

- GetComponentToolbarActionForId(const std::string& id, Browser* browser);

+ GetComponentToolbarActionForId(const std::string& id, Browser* browser,

+ ToolbarActionsBar* bar);

// Sets the factory to use for testing purposes.

// Ownership remains with the caller.

« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc » ('j') | no next file with comments »