OLD | NEW |
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" |
11 #include "ash/wm/window_util.h" | 11 #include "ash/wm/window_util.h" |
12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" | 12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" |
13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h" | 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h" |
14 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 14 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
15 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" | 15 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" |
16 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" | 16 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" |
17 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" | 17 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" |
18 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
19 #include "skia/ext/image_operations.h" | 19 #include "skia/ext/image_operations.h" |
20 #include "ui/aura/client/aura_constants.h" | 20 #include "ui/aura/client/aura_constants.h" |
21 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
22 #include "ui/events/event.h" | 22 #include "ui/events/event.h" |
23 #include "ui/gfx/image/image_skia.h" | 23 #include "ui/gfx/image/image_skia.h" |
24 #include "ui/views/corewm/window_animations.h" | 24 #include "ui/wm/core/window_animations.h" |
25 | 25 |
26 using apps::AppWindow; | 26 using apps::AppWindow; |
27 | 27 |
28 namespace { | 28 namespace { |
29 | 29 |
30 // Size of the icon in the shelf launcher in display-independent pixels. | 30 // Size of the icon in the shelf launcher in display-independent pixels. |
31 const int kAppListIconSize = 24; | 31 const int kAppListIconSize = 24; |
32 | 32 |
33 // This will return a slightly smaller icon than the app icon to be used in | 33 // This will return a slightly smaller icon than the app icon to be used in |
34 // the application list menu. | 34 // the application list menu. |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE); |
285 } else { | 285 } else { |
286 ShowAndActivateOrMinimize(window_to_show); | 286 ShowAndActivateOrMinimize(window_to_show); |
287 } | 287 } |
288 } | 288 } |
OLD | NEW |