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

Side by Side Diff: chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | 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 "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h" 5 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
6 6
7 #include "apps/app_window.h" 7 #include "apps/app_window.h"
8 #include "apps/ui/native_app_window.h" 8 #include "apps/ui/native_app_window.h"
9 #include "ash/shelf/shelf_model.h" 9 #include "ash/shelf/shelf_model.h"
10 #include "ash/wm/window_state.h" 10 #include "ash/wm/window_state.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 if (i != app_windows_.end()) { 274 if (i != app_windows_.end()) {
275 if (++i != app_windows_.end()) 275 if (++i != app_windows_.end())
276 window_to_show = *i; 276 window_to_show = *i;
277 else 277 else
278 window_to_show = app_windows_.front(); 278 window_to_show = app_windows_.front();
279 } 279 }
280 if (window_to_show->GetBaseWindow()->IsActive()) { 280 if (window_to_show->GetBaseWindow()->IsActive()) {
281 // Coming here, only a single window is active. For keyboard activations 281 // Coming here, only a single window is active. For keyboard activations
282 // the window gets animated. 282 // the window gets animated.
283 AnimateWindow(window_to_show->GetNativeWindow(), 283 AnimateWindow(window_to_show->GetNativeWindow(),
284 views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE); 284 wm::WINDOW_ANIMATION_TYPE_BOUNCE);
285 } else { 285 } else {
286 ShowAndActivateOrMinimize(window_to_show); 286 ShowAndActivateOrMinimize(window_to_show);
287 } 287 }
288 } 288 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698