Chromium Code Reviews| 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/arc_app_deferred_launcher_controller.h" | 5 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chromeos/arc/arc_support_host.h" | 7 #include "chrome/browser/chromeos/arc/arc_support_host.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" | 9 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" |
| 10 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controll er.h" | 10 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controll er.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 207 ash::STATUS_RUNNING); | 207 ash::STATUS_RUNNING); |
| 208 } else { | 208 } else { |
| 209 owner_->SetItemController(shelf_id, controller); | 209 owner_->SetItemController(shelf_id, controller); |
| 210 owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING); | 210 owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING); |
| 211 } | 211 } |
| 212 | 212 |
| 213 if (app_controller_map_.empty()) | 213 if (app_controller_map_.empty()) |
| 214 RegisterNextUpdate(); | 214 RegisterNextUpdate(); |
| 215 | 215 |
| 216 app_controller_map_[shelf_app_id] = controller; | 216 app_controller_map_[shelf_app_id] = controller; |
| 217 | |
| 218 // On some boards, ARC is booted with a restricted set of resources by default | |
| 219 // to avoid slowing down Chrome's user session restoration. However, the | |
| 220 // restriction should be lifted once the user explicitly tries to launch an | |
| 221 // ARC app. | |
| 222 arc::PrioritizeArcInstance(); | |
|
khmel
2016/09/08 23:35:27
nit: Probably it is better to put this into arc_ap
Yusuke Sato
2016/09/09 16:20:12
That's simpler, thanks. Done.
| |
| 217 } | 223 } |
| OLD | NEW |