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

Side by Side Diff: ash/mus/window_manager.cc

Issue 2824103004: mus: Adds WindowManagerDelegate::OnWmConnected() (Closed)
Patch Set: Created 3 years, 8 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/mus/window_manager.h ('k') | mash/simple_wm/simple_wm.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/window_manager.h" 5 #include "ash/mus/window_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 323
324 aura::PropertyConverter* WindowManager::GetPropertyConverter() { 324 aura::PropertyConverter* WindowManager::GetPropertyConverter() {
325 return property_converter_.get(); 325 return property_converter_.get();
326 } 326 }
327 327
328 void WindowManager::SetWindowManagerClient(aura::WindowManagerClient* client) { 328 void WindowManager::SetWindowManagerClient(aura::WindowManagerClient* client) {
329 window_manager_client_ = client; 329 window_manager_client_ = client;
330 ash::Shell::set_window_manager_client(client); 330 ash::Shell::set_window_manager_client(client);
331 } 331 }
332 332
333 void WindowManager::OnWmConnected() {}
334
333 void WindowManager::OnWmSetBounds(aura::Window* window, 335 void WindowManager::OnWmSetBounds(aura::Window* window,
334 const gfx::Rect& bounds) { 336 const gfx::Rect& bounds) {
335 // TODO(sky): this indirectly sets bounds, which is against what 337 // TODO(sky): this indirectly sets bounds, which is against what
336 // OnWmSetBounds() recommends doing. Remove that restriction, or fix this. 338 // OnWmSetBounds() recommends doing. Remove that restriction, or fix this.
337 WmWindow::Get(window)->SetBounds(bounds); 339 WmWindow::Get(window)->SetBounds(bounds);
338 } 340 }
339 341
340 bool WindowManager::OnWmSetProperty( 342 bool WindowManager::OnWmSetProperty(
341 aura::Window* window, 343 aura::Window* window,
342 const std::string& name, 344 const std::string& name,
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 bool WindowManager::IsWindowActive(aura::Window* window) { 562 bool WindowManager::IsWindowActive(aura::Window* window) {
561 return Shell::Get()->activation_client()->GetActiveWindow() == window; 563 return Shell::Get()->activation_client()->GetActiveWindow() == window;
562 } 564 }
563 565
564 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { 566 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
565 Shell::Get()->activation_client()->DeactivateWindow(window); 567 Shell::Get()->activation_client()->DeactivateWindow(window);
566 } 568 }
567 569
568 } // namespace mus 570 } // namespace mus
569 } // namespace ash 571 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/window_manager.h ('k') | mash/simple_wm/simple_wm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698