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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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_item_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/common/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
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 bool force_maximize_on_first_run_; 69 bool force_maximize_on_first_run_;
70 bool touchscreen_enabled_in_local_pref_; 70 bool touchscreen_enabled_in_local_pref_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); 72 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
73 }; 73 };
74 74
75 } // namespace test 75 } // namespace test
76 } // namespace ash 76 } // namespace ash
77 77
78 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_ 78 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_shelf_item_delegate.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698