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

Side by Side Diff: athena/wm/window_manager_impl.cc

Issue 513523002: Adding Baseframework of the ResourceManager (all hooks and observers) are being put in place with a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Aaaand another rebase Created 6 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "athena/wm/window_manager_impl.h" 5 #include "athena/wm/window_manager_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "athena/common/container_priorities.h" 9 #include "athena/common/container_priorities.h"
10 #include "athena/screen/public/screen_manager.h" 10 #include "athena/screen/public/screen_manager.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 // instead of exitting. 234 // instead of exitting.
235 if (new_window->type() == ui::wm::WINDOW_TYPE_NORMAL) 235 if (new_window->type() == ui::wm::WINDOW_TYPE_NORMAL)
236 SetInOverview(false); 236 SetInOverview(false);
237 } 237 }
238 238
239 void WindowManagerImpl::OnWindowDestroying(aura::Window* window) { 239 void WindowManagerImpl::OnWindowDestroying(aura::Window* window) {
240 if (window == container_) 240 if (window == container_)
241 container_.reset(); 241 container_.reset();
242 } 242 }
243 243
244 void WindowManagerImpl::OnWindowStackingChanged(aura::Window* window) {
245 // TODO(skuhne): Use |window_list_provider_->IsValidWindow(window)| instead.
246 if (window->type() == ui::wm::WINDOW_TYPE_NORMAL) {
247 FOR_EACH_OBSERVER(WindowManagerObserver,
248 observers_,
249 OnActivityOrderHasChanged());
250 }
251 }
252
244 bool WindowManagerImpl::IsCommandEnabled(int command_id) const { 253 bool WindowManagerImpl::IsCommandEnabled(int command_id) const {
245 return true; 254 return true;
246 } 255 }
247 256
248 bool WindowManagerImpl::OnAcceleratorFired(int command_id, 257 bool WindowManagerImpl::OnAcceleratorFired(int command_id,
249 const ui::Accelerator& accelerator) { 258 const ui::Accelerator& accelerator) {
250 switch (command_id) { 259 switch (command_id) {
251 case CMD_TOGGLE_OVERVIEW: 260 case CMD_TOGGLE_OVERVIEW:
252 ToggleOverview(); 261 ToggleOverview();
253 break; 262 break;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 DCHECK(!instance); 375 DCHECK(!instance);
367 } 376 }
368 377
369 // static 378 // static
370 WindowManager* WindowManager::GetInstance() { 379 WindowManager* WindowManager::GetInstance() {
371 DCHECK(instance); 380 DCHECK(instance);
372 return instance; 381 return instance;
373 } 382 }
374 383
375 } // namespace athena 384 } // namespace athena
OLDNEW
« athena/wm/public/window_manager_observer.h ('K') | « athena/wm/window_manager_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698