| OLD | NEW |
| 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 Loading... |
| 24 std::set<std::string> MockComponentToolbarActionsFactory::GetComponentIds( | 24 std::set<std::string> MockComponentToolbarActionsFactory::GetComponentIds( |
| 25 Profile* profile) { | 25 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 } |
| OLD | NEW |