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

Side by Side Diff: chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h

Issue 1363463002: [Extensions Toolbar] Add a finch config for the redesign (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months 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 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 "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 30 matching lines...) Expand all
41 const extensions::Extension* extension_a() const { 41 const extensions::Extension* extension_a() const {
42 return extension_a_.get(); 42 return extension_a_.get();
43 } 43 }
44 const extensions::Extension* extension_b() const { 44 const extensions::Extension* extension_b() const {
45 return extension_b_.get(); 45 return extension_b_.get();
46 } 46 }
47 const extensions::Extension* extension_c() const { 47 const extensions::Extension* extension_c() const {
48 return extension_c_.get(); 48 return extension_c_.get();
49 } 49 }
50 50
51 private: 51 protected:
52 scoped_ptr<BrowserActionTestUtil> browser_actions_bar_; 52 scoped_ptr<BrowserActionTestUtil> browser_actions_bar_;
53 53
54 // The associated toolbar model, weak. 54 // The associated toolbar model, weak.
55 ToolbarActionsModel* toolbar_model_; 55 ToolbarActionsModel* toolbar_model_;
56 56
57 // Extensions with browser actions used for testing. 57 // Extensions with browser actions used for testing.
58 scoped_refptr<const extensions::Extension> extension_a_; 58 scoped_refptr<const extensions::Extension> extension_a_;
59 scoped_refptr<const extensions::Extension> extension_b_; 59 scoped_refptr<const extensions::Extension> extension_b_;
60 scoped_refptr<const extensions::Extension> extension_c_; 60 scoped_refptr<const extensions::Extension> extension_c_;
Finnur 2015/09/22 14:18:32 Do all these need to be protected as well?
Devlin 2015/09/23 00:28:35 Probably not. :) Done.
61 61
62 // Enable or disable the feature redesign switch.
63 scoped_ptr<extensions::FeatureSwitch::ScopedOverride> override_redesign_;
64
65 private:
62 DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarBrowserTest); 66 DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarBrowserTest);
63 }; 67 };
64 68
65 // A test with the extension-action-redesign switch enabled. 69 // A test with the extension-action-redesign switch enabled.
66 class BrowserActionsBarRedesignBrowserTest 70 class BrowserActionsBarRedesignBrowserTest
67 : public BrowserActionsBarBrowserTest { 71 : public BrowserActionsBarBrowserTest {
68 protected: 72 protected:
69 BrowserActionsBarRedesignBrowserTest(); 73 BrowserActionsBarRedesignBrowserTest();
70 ~BrowserActionsBarRedesignBrowserTest() override; 74 ~BrowserActionsBarRedesignBrowserTest() override;
71 75
72 void SetUpCommandLine(base::CommandLine* command_line) override; 76 void SetUpCommandLine(base::CommandLine* command_line) override;
73 77
74 private: 78 private:
75 // Enable the feature redesign switch.
76 scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
77
78 DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarRedesignBrowserTest); 79 DISALLOW_COPY_AND_ASSIGN(BrowserActionsBarRedesignBrowserTest);
79 }; 80 };
80 81
81 #endif // CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_ 82 #endif // CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698