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

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

Issue 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to after mac app shim fix Created 7 years, 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell_window_launcher_item_controller.h " 5 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h "
6 6
7 #include "apps/native_app_window.h"
7 #include "apps/shell_window.h" 8 #include "apps/shell_window.h"
8 #include "ash/wm/window_properties.h" 9 #include "ash/wm/window_properties.h"
9 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
10 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" 11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h" 12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"
12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h" 14 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
14 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" 15 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
15 #include "chrome/browser/ui/extensions/native_app_window.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 #include "ui/aura/client/aura_constants.h" 17 #include "ui/aura/client/aura_constants.h"
18 #include "ui/aura/window.h" 18 #include "ui/aura/window.h"
19 #include "ui/base/events/event.h" 19 #include "ui/base/events/event.h"
20 #include "ui/views/corewm/window_animations.h" 20 #include "ui/views/corewm/window_animations.h"
21 21
22 using apps::ShellWindow; 22 using apps::ShellWindow;
23 23
24 namespace { 24 namespace {
25 25
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 } 253 }
254 if (window_to_show->GetBaseWindow()->IsActive()) { 254 if (window_to_show->GetBaseWindow()->IsActive()) {
255 // Coming here, only a single window is active. For keyboard activations 255 // Coming here, only a single window is active. For keyboard activations
256 // the window gets animated. 256 // the window gets animated.
257 AnimateWindow(window_to_show->GetNativeWindow(), 257 AnimateWindow(window_to_show->GetNativeWindow(),
258 views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE); 258 views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE);
259 } else { 259 } else {
260 ShowAndActivateOrMinimize(window_to_show); 260 ShowAndActivateOrMinimize(window_to_show);
261 } 261 }
262 } 262 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698