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

Side by Side Diff: chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc

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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h" 5 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h"
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h" 8 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
9 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" 9 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
10 10
(...skipping 13 matching lines...) Expand all
24 std::set<std::string> 24 std::set<std::string>
25 MockComponentToolbarActionsFactory::GetInitialComponentIds(Profile* profile) { 25 MockComponentToolbarActionsFactory::GetInitialComponentIds(Profile* profile) {
26 std::set<std::string> ids; 26 std::set<std::string> ids;
27 ids.insert(kActionIdForTesting); 27 ids.insert(kActionIdForTesting);
28 return ids; 28 return ids;
29 } 29 }
30 30
31 scoped_ptr<ToolbarActionViewController> 31 scoped_ptr<ToolbarActionViewController>
32 MockComponentToolbarActionsFactory::GetComponentToolbarActionForId( 32 MockComponentToolbarActionsFactory::GetComponentToolbarActionForId(
33 const std::string& id, 33 const std::string& id,
34 Browser* browser) { 34 Browser* browser,
35 ToolbarActionsBar* bar) {
35 DCHECK_EQ(kActionIdForTesting, id); 36 DCHECK_EQ(kActionIdForTesting, id);
36 return scoped_ptr<ToolbarActionViewController>( 37 return scoped_ptr<ToolbarActionViewController>(
37 new TestToolbarActionViewController( 38 new TestToolbarActionViewController(
38 MockComponentToolbarActionsFactory::kActionIdForTesting)); 39 MockComponentToolbarActionsFactory::kActionIdForTesting));
39 } 40 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h ('k') | chrome/browser/ui/toolbar/toolbar_actions_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698