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

Side by Side Diff: ash/aura/wm_shell_aura.cc

Issue 2733303004: Removes WmShell::NewWindow() (Closed)
Patch Set: merge and feedback Created 3 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
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/shelf/shelf_window_watcher_unittest.cc » ('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 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/aura/wm_shell_aura.h" 5 #include "ash/aura/wm_shell_aura.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/aura/key_event_watcher_aura.h" 9 #include "ash/aura/key_event_watcher_aura.h"
10 #include "ash/aura/pointer_watcher_adapter.h" 10 #include "ash/aura/pointer_watcher_adapter.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 WmShell::Shutdown(); 65 WmShell::Shutdown();
66 66
67 Shell::GetInstance()->window_tree_host_manager()->Shutdown(); 67 Shell::GetInstance()->window_tree_host_manager()->Shutdown();
68 } 68 }
69 69
70 bool WmShellAura::IsRunningInMash() const { 70 bool WmShellAura::IsRunningInMash() const {
71 return false; 71 return false;
72 } 72 }
73 73
74 WmWindow* WmShellAura::NewWindow(ui::wm::WindowType window_type,
75 ui::LayerType layer_type) {
76 aura::Window* aura_window = new aura::Window(nullptr);
77 aura_window->SetType(window_type);
78 aura_window->Init(layer_type);
79 return WmWindow::Get(aura_window);
80 }
81
82 WmWindow* WmShellAura::GetFocusedWindow() { 74 WmWindow* WmShellAura::GetFocusedWindow() {
83 return WmWindow::Get( 75 return WmWindow::Get(
84 aura::client::GetFocusClient(Shell::GetPrimaryRootWindow()) 76 aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
85 ->GetFocusedWindow()); 77 ->GetFocusedWindow());
86 } 78 }
87 79
88 WmWindow* WmShellAura::GetActiveWindow() { 80 WmWindow* WmShellAura::GetActiveWindow() {
89 return WmWindow::Get(wm::GetActiveWindow()); 81 return WmWindow::Get(wm::GetActiveWindow());
90 } 82 }
91 83
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 for (auto& observer : display_observers_) 287 for (auto& observer : display_observers_)
296 observer.OnDisplayConfigurationChanging(); 288 observer.OnDisplayConfigurationChanging();
297 } 289 }
298 290
299 void WmShellAura::OnDisplayConfigurationChanged() { 291 void WmShellAura::OnDisplayConfigurationChanged() {
300 for (auto& observer : display_observers_) 292 for (auto& observer : display_observers_)
301 observer.OnDisplayConfigurationChanged(); 293 observer.OnDisplayConfigurationChanged();
302 } 294 }
303 295
304 } // namespace ash 296 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698