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

Side by Side Diff: mash/wm/root_window_controller.cc

Issue 2009073003: Move mojo/converters/geometry -> ui/gfx/geometry/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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 "mash/wm/root_window_controller.h" 5 #include "mash/wm/root_window_controller.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <map> 9 #include <map>
10 #include <sstream> 10 #include <sstream>
(...skipping 22 matching lines...) Expand all
33 #include "mash/wm/bridge/wm_shelf_mus.h" 33 #include "mash/wm/bridge/wm_shelf_mus.h"
34 #include "mash/wm/bridge/wm_window_mus.h" 34 #include "mash/wm/bridge/wm_window_mus.h"
35 #include "mash/wm/container_ids.h" 35 #include "mash/wm/container_ids.h"
36 #include "mash/wm/fill_layout.h" 36 #include "mash/wm/fill_layout.h"
37 #include "mash/wm/screenlock_layout.h" 37 #include "mash/wm/screenlock_layout.h"
38 #include "mash/wm/shadow_controller.h" 38 #include "mash/wm/shadow_controller.h"
39 #include "mash/wm/shelf_layout_manager.h" 39 #include "mash/wm/shelf_layout_manager.h"
40 #include "mash/wm/status_layout_manager.h" 40 #include "mash/wm/status_layout_manager.h"
41 #include "mash/wm/window_manager.h" 41 #include "mash/wm/window_manager.h"
42 #include "mash/wm/window_manager_application.h" 42 #include "mash/wm/window_manager_application.h"
43 #include "mojo/converters/geometry/geometry_type_converters.h"
44 #include "mojo/public/cpp/bindings/type_converter.h" 43 #include "mojo/public/cpp/bindings/type_converter.h"
45 #include "services/shell/public/cpp/connector.h" 44 #include "services/shell/public/cpp/connector.h"
45 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
46 #include "ui/mojo/display/display_type_converters.h" 46 #include "ui/mojo/display/display_type_converters.h"
47 47
48 namespace mash { 48 namespace mash {
49 namespace wm { 49 namespace wm {
50 namespace { 50 namespace {
51 51
52 const uint32_t kWindowSwitchAccelerator = 1; 52 const uint32_t kWindowSwitchAccelerator = 1;
53 53
54 void AssertTrue(bool success) { 54 void AssertTrue(bool success) {
55 DCHECK(success); 55 DCHECK(success);
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 mus::Window* user_private_panels = 339 mus::Window* user_private_panels =
340 GetWindowForContainer(mojom::Container::USER_PRIVATE_PANELS); 340 GetWindowForContainer(mojom::Container::USER_PRIVATE_PANELS);
341 WmWindowMus* user_private_panels_wm = WmWindowMus::Get(user_private_panels); 341 WmWindowMus* user_private_panels_wm = WmWindowMus::Get(user_private_panels);
342 layout_managers_.erase(user_private_panels); 342 layout_managers_.erase(user_private_panels);
343 user_private_panels_wm->SetLayoutManager( 343 user_private_panels_wm->SetLayoutManager(
344 base::WrapUnique(new ash::PanelLayoutManager(user_private_panels_wm))); 344 base::WrapUnique(new ash::PanelLayoutManager(user_private_panels_wm)));
345 } 345 }
346 346
347 } // namespace wm 347 } // namespace wm
348 } // namespace mash 348 } // namespace mash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698