| 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 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ | 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ |
| 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ | 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 | 99 |
| 100 // The overflow container's BrowserActionTestUtil (only non-null if | 100 // The overflow container's BrowserActionTestUtil (only non-null if |
| 101 // |use_redesign| is true). | 101 // |use_redesign| is true). |
| 102 std::unique_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_; | 102 std::unique_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_; |
| 103 | 103 |
| 104 // True if the extension action redesign switch should be enabled. | 104 // True if the extension action redesign switch should be enabled. |
| 105 bool use_redesign_; | 105 bool use_redesign_; |
| 106 | 106 |
| 107 std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> redesign_switch_; | 107 std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> redesign_switch_; |
| 108 | 108 |
| 109 std::unique_ptr<ui::test::MaterialDesignControllerTestAPI> |
| 110 material_design_state_; |
| 111 |
| 109 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarUnitTest); | 112 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarUnitTest); |
| 110 }; | 113 }; |
| 111 | 114 |
| 112 class ToolbarActionsBarRedesignUnitTest : public ToolbarActionsBarUnitTest { | 115 class ToolbarActionsBarRedesignUnitTest : public ToolbarActionsBarUnitTest { |
| 113 public: | 116 public: |
| 114 ToolbarActionsBarRedesignUnitTest(); | 117 ToolbarActionsBarRedesignUnitTest(); |
| 115 ~ToolbarActionsBarRedesignUnitTest() override; | 118 ~ToolbarActionsBarRedesignUnitTest() override; |
| 116 | 119 |
| 117 private: | 120 private: |
| 118 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarRedesignUnitTest); | 121 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarRedesignUnitTest); |
| 119 }; | 122 }; |
| 120 | 123 |
| 121 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ | 124 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ |
| OLD | NEW |