| 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 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" | 4 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" | 
| 5 | 5 | 
| 6 #include <string> | 6 #include <string> | 
| 7 | 7 | 
| 8 #include "ash/common/shelf/shelf_delegate.h" |  | 
| 9 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |  | 
| 10 #include "ash/common/wm/window_state.h" |  | 
| 11 #include "ash/common/wm_shell.h" |  | 
| 12 #include "ash/common/wm_window.h" |  | 
| 13 #include "ash/display/screen_orientation_controller_chromeos.h" | 8 #include "ash/display/screen_orientation_controller_chromeos.h" | 
| 14 #include "ash/shared/app_types.h" | 9 #include "ash/shared/app_types.h" | 
|  | 10 #include "ash/shelf/shelf_delegate.h" | 
| 15 #include "ash/shell.h" | 11 #include "ash/shell.h" | 
|  | 12 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 
| 16 #include "ash/wm/window_properties.h" | 13 #include "ash/wm/window_properties.h" | 
|  | 14 #include "ash/wm/window_state.h" | 
| 17 #include "ash/wm/window_state_aura.h" | 15 #include "ash/wm/window_state_aura.h" | 
| 18 #include "ash/wm/window_util.h" | 16 #include "ash/wm/window_util.h" | 
|  | 17 #include "ash/wm_shell.h" | 
|  | 18 #include "ash/wm_window.h" | 
| 19 #include "base/bind.h" | 19 #include "base/bind.h" | 
| 20 #include "base/memory/ptr_util.h" | 20 #include "base/memory/ptr_util.h" | 
| 21 #include "chrome/browser/chromeos/arc/arc_support_host.h" | 21 #include "chrome/browser/chromeos/arc/arc_support_host.h" | 
| 22 #include "chrome/browser/chromeos/arc/arc_util.h" | 22 #include "chrome/browser/chromeos/arc/arc_util.h" | 
| 23 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" | 
| 24 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" | 24 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" | 
| 25 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller
     .h" | 25 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller
     .h" | 
| 26 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 26 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 
| 27 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 27 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 
| 28 #include "components/arc/arc_bridge_service.h" | 28 #include "components/arc/arc_bridge_service.h" | 
| (...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 718   const std::string arc_app_id = exo::ShellSurface::GetApplicationId(window); | 718   const std::string arc_app_id = exo::ShellSurface::GetApplicationId(window); | 
| 719   if (arc_app_id.empty()) | 719   if (arc_app_id.empty()) | 
| 720     return -1; | 720     return -1; | 
| 721 | 721 | 
| 722   int task_id = -1; | 722   int task_id = -1; | 
| 723   if (sscanf(arc_app_id.c_str(), "org.chromium.arc.%d", &task_id) != 1) | 723   if (sscanf(arc_app_id.c_str(), "org.chromium.arc.%d", &task_id) != 1) | 
| 724     return -1; | 724     return -1; | 
| 725 | 725 | 
| 726   return task_id; | 726   return task_id; | 
| 727 } | 727 } | 
| OLD | NEW | 
|---|