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

Side by Side Diff: ash/test/test_shell_delegate.h

Issue 2827193004: Make PrefService available in *ash (Closed)
Patch Set: Adding NOTREACHED() comment. Created 3 years, 8 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
« no previous file with comments | « ash/test/BUILD.gn ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_TEST_TEST_SHELL_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_
6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_ 6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "ash/shell_delegate.h" 11 #include "ash/shell_delegate.h"
12 #include "ash/test/test_session_state_delegate.h" 12 #include "ash/test/test_session_state_delegate.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 14
15 class TestingPrefServiceSimple;
16
15 namespace keyboard { 17 namespace keyboard {
16 class KeyboardUI; 18 class KeyboardUI;
17 } 19 }
18 20
19 namespace ash { 21 namespace ash {
20 namespace test { 22 namespace test {
21 23
22 class ShelfInitializer; 24 class ShelfInitializer;
23 25
24 class TestShellDelegate : public ShellDelegate { 26 class TestShellDelegate : public ShellDelegate {
(...skipping 22 matching lines...) Expand all
47 SystemTrayDelegate* CreateSystemTrayDelegate() override; 49 SystemTrayDelegate* CreateSystemTrayDelegate() override;
48 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override; 50 std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
49 TestSessionStateDelegate* CreateSessionStateDelegate() override; 51 TestSessionStateDelegate* CreateSessionStateDelegate() override;
50 AccessibilityDelegate* CreateAccessibilityDelegate() override; 52 AccessibilityDelegate* CreateAccessibilityDelegate() override;
51 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override; 53 std::unique_ptr<PaletteDelegate> CreatePaletteDelegate() override;
52 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf, 54 ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
53 const ShelfItem* item) override; 55 const ShelfItem* item) override;
54 GPUSupport* CreateGPUSupport() override; 56 GPUSupport* CreateGPUSupport() override;
55 base::string16 GetProductName() const override; 57 base::string16 GetProductName() const override;
56 gfx::Image GetDeprecatedAcceleratorImage() const override; 58 gfx::Image GetDeprecatedAcceleratorImage() const override;
57 59 PrefService* GetActiveUserPrefService() const override;
58 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override; 60 bool IsTouchscreenEnabledInPrefs(bool use_local_state) const override;
59 void SetTouchscreenEnabledInPrefs(bool enabled, 61 void SetTouchscreenEnabledInPrefs(bool enabled,
60 bool use_local_state) override; 62 bool use_local_state) override;
61 void UpdateTouchscreenStatusFromPrefs() override; 63 void UpdateTouchscreenStatusFromPrefs() override;
62 64
63 int num_exit_requests() const { return num_exit_requests_; } 65 int num_exit_requests() const { return num_exit_requests_; }
64 66
65 void SetForceMaximizeOnFirstRun(bool maximize) { 67 void SetForceMaximizeOnFirstRun(bool maximize) {
66 force_maximize_on_first_run_ = maximize; 68 force_maximize_on_first_run_ = maximize;
67 } 69 }
68 70
69 private: 71 private:
70 int num_exit_requests_; 72 int num_exit_requests_;
71 bool multi_profiles_enabled_; 73 bool multi_profiles_enabled_;
72 bool force_maximize_on_first_run_; 74 bool force_maximize_on_first_run_;
73 bool touchscreen_enabled_in_local_pref_; 75 bool touchscreen_enabled_in_local_pref_;
74 std::unique_ptr<ShelfInitializer> shelf_initializer_; 76 std::unique_ptr<ShelfInitializer> shelf_initializer_;
77 std::unique_ptr<TestingPrefServiceSimple> pref_service_;
75 78
76 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 79 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
77 }; 80 };
78 81
79 } // namespace test 82 } // namespace test
80 } // namespace ash 83 } // namespace ash
81 84
82 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 85 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/BUILD.gn ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698