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/common/test/ash_test.h" | 5 #include "ash/common/test/ash_test.h" |
6 | 6 |
7 #include "ash/common/shelf/wm_shelf.h" | 7 #include "ash/common/shelf/wm_shelf.h" |
8 #include "ash/common/system/status_area_widget.h" | 8 #include "ash/common/system/status_area_widget.h" |
9 #include "ash/common/test/ash_test_impl.h" | 9 #include "ash/common/test/ash_test_impl.h" |
10 #include "ash/common/test/test_session_state_delegate.h" | 10 #include "ash/common/test/test_session_state_delegate.h" |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
98 return widget; | 98 return widget; |
99 } | 99 } |
100 | 100 |
101 display::Display AshTest::GetSecondaryDisplay() { | 101 display::Display AshTest::GetSecondaryDisplay() { |
102 return test_impl_->GetSecondaryDisplay(); | 102 return test_impl_->GetSecondaryDisplay(); |
103 } | 103 } |
104 | 104 |
105 bool AshTest::SetSecondaryDisplayPlacement( | 105 bool AshTest::SetSecondaryDisplayPlacement( |
106 display::DisplayPlacement::Position position, | 106 display::DisplayPlacement::Position position, |
107 int offset) { | 107 int offset) { |
108 if (WmShell::Get()->IsRunningInMash()) { | |
msw
2017/02/19 21:49:20
Doesn't AshTestImplMus::SetSecondaryDisplayPlaceme
sky
2017/02/21 17:06:50
Done.
| |
109 NOTIMPLEMENTED(); | |
110 return false; | |
111 } | |
108 return test_impl_->SetSecondaryDisplayPlacement(position, offset); | 112 return test_impl_->SetSecondaryDisplayPlacement(position, offset); |
109 } | 113 } |
110 | 114 |
111 void AshTest::ConfigureWidgetInitParamsForDisplay( | 115 void AshTest::ConfigureWidgetInitParamsForDisplay( |
112 WmWindow* window, | 116 WmWindow* window, |
113 views::Widget::InitParams* init_params) { | 117 views::Widget::InitParams* init_params) { |
114 test_impl_->ConfigureWidgetInitParamsForDisplay(window, init_params); | 118 test_impl_->ConfigureWidgetInitParamsForDisplay(window, init_params); |
115 } | 119 } |
116 | 120 |
117 void AshTest::ParentWindowInPrimaryRootWindow(WmWindow* window) { | 121 void AshTest::ParentWindowInPrimaryRootWindow(WmWindow* window) { |
(...skipping 12 matching lines...) Expand all Loading... | |
130 | 134 |
131 void AshTest::SetUp() { | 135 void AshTest::SetUp() { |
132 test_impl_->SetUp(); | 136 test_impl_->SetUp(); |
133 } | 137 } |
134 | 138 |
135 void AshTest::TearDown() { | 139 void AshTest::TearDown() { |
136 test_impl_->TearDown(); | 140 test_impl_->TearDown(); |
137 } | 141 } |
138 | 142 |
139 } // namespace ash | 143 } // namespace ash |
OLD | NEW |