| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_BROWSER_ACTIONS_BAR_BROWSERTEST_H_ | 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_ |
| 6 #define CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_ | 6 #define CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 ToolbarActionsModel* toolbar_model_; | 62 ToolbarActionsModel* toolbar_model_; |
| 63 | 63 |
| 64 // Extensions with browser actions used for testing. | 64 // Extensions with browser actions used for testing. |
| 65 scoped_refptr<const extensions::Extension> extension_a_; | 65 scoped_refptr<const extensions::Extension> extension_a_; |
| 66 scoped_refptr<const extensions::Extension> extension_b_; | 66 scoped_refptr<const extensions::Extension> extension_b_; |
| 67 scoped_refptr<const extensions::Extension> extension_c_; | 67 scoped_refptr<const extensions::Extension> extension_c_; |
| 68 | 68 |
| 69 DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarBrowserTest); | 69 DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarBrowserTest); |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 // A test with the extension-action-redesign switch enabled. | 72 // A test with the extension-action-redesign switch disabled. |
| 73 class BrowserActionsBarRedesignBrowserTest | 73 class BrowserActionsBarLegacyBrowserTest |
| 74 : public BrowserActionsBarBrowserTest { | 74 : public BrowserActionsBarBrowserTest { |
| 75 protected: | 75 protected: |
| 76 BrowserActionsBarRedesignBrowserTest(); | 76 BrowserActionsBarLegacyBrowserTest(); |
| 77 ~BrowserActionsBarRedesignBrowserTest() override; | 77 ~BrowserActionsBarLegacyBrowserTest() override; |
| 78 | 78 |
| 79 void SetUpCommandLine(base::CommandLine* command_line) override; | 79 void SetUpCommandLine(base::CommandLine* command_line) override; |
| 80 | 80 |
| 81 private: | 81 private: |
| 82 DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarRedesignBrowserTest); | 82 DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarLegacyBrowserTest); |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 #endif // CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_ | 85 #endif // CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_ |
| OLD | NEW |