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

Side by Side Diff: ash/test/shell_test_api.cc

Issue 192483007: Move chromeos/display/* to ui/display/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include display.gyp into ChromeOS builds only Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/chromeos/power/power_event_observer.cc ('k') | ash/touch/touch_observer_hud.h » ('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 #include "ash/test/shell_test_api.h" 5 #include "ash/test/shell_test_api.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_delegate.h" 8 #include "ash/shelf/shelf_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 10
11 #if defined(OS_CHROMEOS) 11 #if defined(OS_CHROMEOS)
12 #include "ash/display/output_configurator_animation.h" 12 #include "ash/display/output_configurator_animation.h"
13 #include "chromeos/display/output_configurator.h" 13 #include "ui/display/chromeos/output_configurator.h"
14 #endif 14 #endif
15 15
16 namespace ash { 16 namespace ash {
17 namespace test { 17 namespace test {
18 18
19 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} 19 ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {}
20 20
21 internal::RootWindowLayoutManager* ShellTestApi::root_window_layout() { 21 internal::RootWindowLayoutManager* ShellTestApi::root_window_layout() {
22 return shell_->GetPrimaryRootWindowController()->root_window_layout(); 22 return shell_->GetPrimaryRootWindowController()->root_window_layout();
23 } 23 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 } 71 }
72 #endif // defined(OS_CHROMEOS) 72 #endif // defined(OS_CHROMEOS)
73 } 73 }
74 74
75 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) { 75 void ShellTestApi::SetShelfDelegate(ShelfDelegate* delegate) {
76 shell_->shelf_delegate_.reset(delegate); 76 shell_->shelf_delegate_.reset(delegate);
77 } 77 }
78 78
79 } // namespace test 79 } // namespace test
80 } // namespace ash 80 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/power/power_event_observer.cc ('k') | ash/touch/touch_observer_hud.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698