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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2194353002: mash: Migrate ScopedTargetRootWindow to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: similarity 40 Created 4 years, 4 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
OLDNEW
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/mus/bridge/wm_shell_mus.h" 5 #include "ash/mus/bridge/wm_shell_mus.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/display/display_info.h" 10 #include "ash/common/display/display_info.h"
11 #include "ash/common/keyboard/keyboard_ui.h" 11 #include "ash/common/keyboard/keyboard_ui.h"
12 #include "ash/common/scoped_root_window_for_new_windows.h"
12 #include "ash/common/session/session_state_delegate.h" 13 #include "ash/common/session/session_state_delegate.h"
13 #include "ash/common/shell_delegate.h" 14 #include "ash/common/shell_delegate.h"
14 #include "ash/common/shell_observer.h" 15 #include "ash/common/shell_observer.h"
15 #include "ash/common/shell_window_ids.h" 16 #include "ash/common/shell_window_ids.h"
16 #include "ash/common/system/tray/default_system_tray_delegate.h" 17 #include "ash/common/system/tray/default_system_tray_delegate.h"
17 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" 18 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
18 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" 19 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h"
19 #include "ash/common/wm/mru_window_tracker.h" 20 #include "ash/common/wm/mru_window_tracker.h"
20 #include "ash/common/wm/window_cycle_event_filter.h" 21 #include "ash/common/wm/window_cycle_event_filter.h"
21 #include "ash/common/wm/window_resizer.h" 22 #include "ash/common/wm/window_resizer.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 205
205 WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) { 206 WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) {
206 return GetRootWindowControllerWithDisplayId(display_id)->GetWindow(); 207 return GetRootWindowControllerWithDisplayId(display_id)->GetWindow();
207 } 208 }
208 209
209 WmWindow* WmShellMus::GetRootWindowForNewWindows() { 210 WmWindow* WmShellMus::GetRootWindowForNewWindows() {
210 NOTIMPLEMENTED(); 211 NOTIMPLEMENTED();
211 return root_window_controllers_[0]->GetWindow(); 212 return root_window_controllers_[0]->GetWindow();
212 } 213 }
213 214
215 std::unique_ptr<ScopedRootWindowForNewWindows>
216 WmShellMus::CreateScopedRootWindowForNewWindows(WmWindow* root) {
217 NOTIMPLEMENTED();
218 return nullptr;
219 }
220
214 const DisplayInfo& WmShellMus::GetDisplayInfo(int64_t display_id) const { 221 const DisplayInfo& WmShellMus::GetDisplayInfo(int64_t display_id) const {
215 NOTIMPLEMENTED(); 222 NOTIMPLEMENTED();
216 static DisplayInfo fake_info; 223 static DisplayInfo fake_info;
217 return fake_info; 224 return fake_info;
218 } 225 }
219 226
220 bool WmShellMus::IsActiveDisplayId(int64_t display_id) const { 227 bool WmShellMus::IsActiveDisplayId(int64_t display_id) const {
221 // TODO: implement http://crbug.com/622480. 228 // TODO: implement http://crbug.com/622480.
222 NOTIMPLEMENTED(); 229 NOTIMPLEMENTED();
223 return true; 230 return true;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 OnWindowActivated(gained_active, lost_active)); 373 OnWindowActivated(gained_active, lost_active));
367 } 374 }
368 375
369 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { 376 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
370 DCHECK_EQ(window_tree_client(), client); 377 DCHECK_EQ(window_tree_client(), client);
371 client->RemoveObserver(this); 378 client->RemoveObserver(this);
372 } 379 }
373 380
374 } // namespace mus 381 } // namespace mus
375 } // namespace ash 382 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698