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

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

Issue 2825533003: mash: Prerequisites for removing ShelfDelegate. (Closed)
Patch Set: Expand CheckWindowAndItemPlacement 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/test_shelf_delegate.cc ('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 namespace keyboard { 15 namespace keyboard {
16 class KeyboardUI; 16 class KeyboardUI;
17 } 17 }
18 18
19 namespace ash { 19 namespace ash {
20 namespace test { 20 namespace test {
21 21
22 class ShelfInitializer;
23
22 class TestShellDelegate : public ShellDelegate { 24 class TestShellDelegate : public ShellDelegate {
23 public: 25 public:
24 TestShellDelegate(); 26 TestShellDelegate();
25 ~TestShellDelegate() override; 27 ~TestShellDelegate() override;
26 28
27 void set_multi_profiles_enabled(bool multi_profiles_enabled) { 29 void set_multi_profiles_enabled(bool multi_profiles_enabled) {
28 multi_profiles_enabled_ = multi_profiles_enabled; 30 multi_profiles_enabled_ = multi_profiles_enabled;
29 } 31 }
30 32
31 // Overridden from ShellDelegate: 33 // Overridden from ShellDelegate:
(...skipping 29 matching lines...) Expand all
61 63
62 void SetForceMaximizeOnFirstRun(bool maximize) { 64 void SetForceMaximizeOnFirstRun(bool maximize) {
63 force_maximize_on_first_run_ = maximize; 65 force_maximize_on_first_run_ = maximize;
64 } 66 }
65 67
66 private: 68 private:
67 int num_exit_requests_; 69 int num_exit_requests_;
68 bool multi_profiles_enabled_; 70 bool multi_profiles_enabled_;
69 bool force_maximize_on_first_run_; 71 bool force_maximize_on_first_run_;
70 bool touchscreen_enabled_in_local_pref_; 72 bool touchscreen_enabled_in_local_pref_;
73 std::unique_ptr<ShelfInitializer> shelf_initializer_;
71 74
72 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 75 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
73 }; 76 };
74 77
75 } // namespace test 78 } // namespace test
76 } // namespace ash 79 } // namespace ash
77 80
78 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 81 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_shelf_delegate.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698