OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/ash_test.h" | 5 #include "ash/test/ash_test.h" |
6 | 6 |
| 7 #include "ash/public/cpp/config.h" |
7 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
8 #include "ash/shelf/wm_shelf.h" | 9 #include "ash/shelf/wm_shelf.h" |
9 #include "ash/shell.h" | 10 #include "ash/shell.h" |
10 #include "ash/shell_port.h" | 11 #include "ash/shell_port.h" |
11 #include "ash/system/status_area_widget.h" | 12 #include "ash/system/status_area_widget.h" |
12 #include "ash/test/ash_test_impl.h" | 13 #include "ash/test/ash_test_impl.h" |
13 #include "ash/test/test_session_state_delegate.h" | 14 #include "ash/test/test_session_state_delegate.h" |
14 #include "ash/test/test_system_tray_delegate.h" | 15 #include "ash/test/test_system_tray_delegate.h" |
15 #include "ash/wm_window.h" | 16 #include "ash/wm_window.h" |
16 #include "base/memory/ptr_util.h" | 17 #include "base/memory/ptr_util.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 return widget; | 102 return widget; |
102 } | 103 } |
103 | 104 |
104 display::Display AshTest::GetSecondaryDisplay() { | 105 display::Display AshTest::GetSecondaryDisplay() { |
105 return test_impl_->GetSecondaryDisplay(); | 106 return test_impl_->GetSecondaryDisplay(); |
106 } | 107 } |
107 | 108 |
108 bool AshTest::SetSecondaryDisplayPlacement( | 109 bool AshTest::SetSecondaryDisplayPlacement( |
109 display::DisplayPlacement::Position position, | 110 display::DisplayPlacement::Position position, |
110 int offset) { | 111 int offset) { |
111 if (ShellPort::Get()->IsRunningInMash()) { | 112 if (Shell::GetAshConfig() == Config::MASH) { |
112 NOTIMPLEMENTED(); | 113 NOTIMPLEMENTED(); |
113 return false; | 114 return false; |
114 } | 115 } |
115 return test_impl_->SetSecondaryDisplayPlacement(position, offset); | 116 return test_impl_->SetSecondaryDisplayPlacement(position, offset); |
116 } | 117 } |
117 | 118 |
118 void AshTest::ConfigureWidgetInitParamsForDisplay( | 119 void AshTest::ConfigureWidgetInitParamsForDisplay( |
119 WmWindow* window, | 120 WmWindow* window, |
120 views::Widget::InitParams* init_params) { | 121 views::Widget::InitParams* init_params) { |
121 test_impl_->ConfigureWidgetInitParamsForDisplay(window, init_params); | 122 test_impl_->ConfigureWidgetInitParamsForDisplay(window, init_params); |
(...skipping 15 matching lines...) Expand all Loading... |
137 | 138 |
138 void AshTest::SetUp() { | 139 void AshTest::SetUp() { |
139 test_impl_->SetUp(); | 140 test_impl_->SetUp(); |
140 } | 141 } |
141 | 142 |
142 void AshTest::TearDown() { | 143 void AshTest::TearDown() { |
143 test_impl_->TearDown(); | 144 test_impl_->TearDown(); |
144 } | 145 } |
145 | 146 |
146 } // namespace ash | 147 } // namespace ash |
OLD | NEW |