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

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
« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 »

Powered by Google App Engine
This is Rietveld 408576698