| OLD | NEW |
| 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" | |
| 8 #include "apps/shell_window.h" | 7 #include "apps/shell_window.h" |
| 8 #include "apps/ui/native_app_window.h" |
| 9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
| 10 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.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.h" |
| 12 #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" |
| 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| 14 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" | 14 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" |
| 15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
| 16 #include "ui/aura/client/aura_constants.h" | 16 #include "ui/aura/client/aura_constants.h" |
| 17 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
| 18 #include "ui/events/event.h" | 18 #include "ui/events/event.h" |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 } | 239 } |
| 240 if (window_to_show->GetBaseWindow()->IsActive()) { | 240 if (window_to_show->GetBaseWindow()->IsActive()) { |
| 241 // Coming here, only a single window is active. For keyboard activations | 241 // Coming here, only a single window is active. For keyboard activations |
| 242 // the window gets animated. | 242 // the window gets animated. |
| 243 AnimateWindow(window_to_show->GetNativeWindow(), | 243 AnimateWindow(window_to_show->GetNativeWindow(), |
| 244 views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE); | 244 views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE); |
| 245 } else { | 245 } else { |
| 246 ShowAndActivateOrMinimize(window_to_show); | 246 ShowAndActivateOrMinimize(window_to_show); |
| 247 } | 247 } |
| 248 } | 248 } |
| OLD | NEW |