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

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

Issue 2350733005: [Extensions] Fix a bug in the startup pages override bubble (Closed)
Patch Set: Trim includes Created 4 years, 2 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 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>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "chrome/browser/extensions/browser_action_test_util.h" 13 #include "chrome/browser/extensions/browser_action_test_util.h"
14 #include "chrome/browser/extensions/extension_action_test_util.h" 14 #include "chrome/browser/extensions/extension_action_test_util.h"
15 #include "chrome/test/base/browser_with_test_window_test.h" 15 #include "chrome/test/base/browser_with_test_window_test.h"
16 #include "ui/base/material_design/material_design_controller.h" 16 #include "ui/base/material_design/material_design_controller.h"
17 17
18 class ExtensionAction; 18 class ExtensionAction;
19 class ScopedTestingLocalState;
19 class ToolbarActionsBar; 20 class ToolbarActionsBar;
20 21
21 namespace content { 22 namespace content {
22 class WebContents; 23 class WebContents;
23 } 24 }
24 25
25 namespace extensions { 26 namespace extensions {
26 class Extension; 27 class Extension;
27 } 28 }
28 29
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // A BrowserActionTestUtil object constructed with the associated 93 // A BrowserActionTestUtil object constructed with the associated
93 // ToolbarActionsBar. 94 // ToolbarActionsBar.
94 std::unique_ptr<BrowserActionTestUtil> browser_action_test_util_; 95 std::unique_ptr<BrowserActionTestUtil> browser_action_test_util_;
95 96
96 // The overflow container's BrowserActionTestUtil. 97 // The overflow container's BrowserActionTestUtil.
97 std::unique_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_; 98 std::unique_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_;
98 99
99 std::unique_ptr<ui::test::MaterialDesignControllerTestAPI> 100 std::unique_ptr<ui::test::MaterialDesignControllerTestAPI>
100 material_design_state_; 101 material_design_state_;
101 102
103 // Local state for the browser process.
104 std::unique_ptr<ScopedTestingLocalState> local_state_;
105
102 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarUnitTest); 106 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarUnitTest);
103 }; 107 };
104 108
105 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_ 109 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698