| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/extension_app_window_launcher_item_cont
roller.h" | 5 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_cont
roller.h" |
| 6 | 6 |
| 7 #include "ash/public/cpp/shelf_item_delegate.h" | 7 #include "ash/public/cpp/shelf_item_delegate.h" |
| 8 #include "ash/wm/window_state.h" | 8 #include "ash/wm/window_state.h" |
| 9 #include "ash/wm/window_state_aura.h" | |
| 10 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
| 11 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| 14 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" | 13 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" |
| 15 #include "components/favicon/content/content_favicon_driver.h" | 14 #include "components/favicon/content/content_favicon_driver.h" |
| 16 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
| 17 #include "extensions/browser/app_window/app_window.h" | 16 #include "extensions/browser/app_window/app_window.h" |
| 18 #include "extensions/browser/app_window/app_window_registry.h" | 17 #include "extensions/browser/app_window/app_window_registry.h" |
| 19 #include "extensions/browser/app_window/native_app_window.h" | 18 #include "extensions/browser/app_window/native_app_window.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 ++window_index; | 66 ++window_index; |
| 68 } | 67 } |
| 69 return items; | 68 return items; |
| 70 } | 69 } |
| 71 | 70 |
| 72 void ExtensionAppWindowLauncherItemController::ExecuteCommand( | 71 void ExtensionAppWindowLauncherItemController::ExecuteCommand( |
| 73 uint32_t command_id, | 72 uint32_t command_id, |
| 74 int32_t event_flags) { | 73 int32_t event_flags) { |
| 75 ChromeLauncherController::instance()->ActivateShellApp(app_id(), command_id); | 74 ChromeLauncherController::instance()->ActivateShellApp(app_id(), command_id); |
| 76 } | 75 } |
| OLD | NEW |