Move Voice Interaction shortcut to accelerator_controller.cc

chrome/browser/ui/app_list/arc/arc_app_utils.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 
 #include <memory>
 #include <string>
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/json/json_writer.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/arc/arc_migration_guide_notification.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"

[Yusuke Sato, 2017/05/23 23:11:56]

delete

[yueli, 2017/05/23 23:38:14]

Done.

 #include "chromeos/dbus/session_manager_client.h"

[Yusuke Sato, 2017/05/23 23:11:56]

delete

[yueli, 2017/05/23 23:38:14]

Done.

 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_features.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/arc_util.h"
 #include "components/arc/common/intent_helper.mojom.h"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/event_constants.h"
 
@@ skipping 26 matching lines @@
 
 // Intent helper strings.
 constexpr char kIntentHelperClassName[] =
     "org.chromium.arc.intent_helper.SettingsReceiver";
 constexpr char kIntentHelperPackageName[] = "org.chromium.arc.intent_helper";
 constexpr char kSetInTouchModeIntent[] =
     "org.chromium.arc.intent_helper.SET_IN_TOUCH_MODE";
 constexpr char kShowTalkbackSettingsIntent[] =
     "org.chromium.arc.intent_helper.SHOW_TALKBACK_SETTINGS";
 
-void SetArcCpuRestrictionCallback(bool success) {
-  VLOG(2) << "Finished prioritizing the instance: result=" << success;
-  if (!success)
-    LOG(ERROR) << "Failed to prioritize ARC";
-}
-
 // Find a proper size and position for a given rectangle on the screen.
 // TODO(skuhne): This needs more consideration, but it is lacking
 // WindowPositioner functionality since we do not have an Aura::Window yet.
 gfx::Rect GetTargetRect(const gfx::Size& size) {
   // Make sure that the window will fit into our workspace.
   // Note that ARC will always be on the primary screen (for now).
   // Note that Android's coordinate system is only valid inside the working
   // area. We can therefore ignore the provided left / top offsets.
   aura::Window* root = ash::Shell::GetPrimaryRootWindow();
   gfx::Rect work_area =
@@ skipping 240 matching lines @@
         ChromeLauncherController::instance();
     DCHECK(chrome_controller || !ash::Shell::HasInstance());
     if (chrome_controller) {
       chrome_controller->GetArcDeferredLauncher()->RegisterDeferredLaunch(
           app_id, event_flags);
 
       // On some boards, ARC is booted with a restricted set of resources by
       // default to avoid slowing down Chrome's user session restoration.
       // However, the restriction should be lifted once the user explicitly
       // tries to launch an ARC app.
-      VLOG(2) << "Prioritizing the instance";
-      chromeos::SessionManagerClient* session_manager_client =
-          chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
-      session_manager_client->SetArcCpuRestriction(
-          login_manager::CONTAINER_CPU_RESTRICTION_FOREGROUND,
-          base::Bind(SetArcCpuRestrictionCallback));
+      PrioritizeArcContainerStartup();
     }
     prefs->SetLastLaunchTime(app_id, base::Time::Now());
     return true;
   }
   return (new LaunchAppWithoutSize(context, app_id, landscape_layout,
                                    event_flags))
       ->LaunchAndRelease();
 }
 
 void SetTaskActive(int task_id) {
@@ skipping 116 matching lines @@
     return false;
 
   const ArcAppListPrefs* const arc_prefs = ArcAppListPrefs::Get(context);
   if (!arc_prefs)
     return false;
 
   return arc_prefs->IsRegistered(ArcAppShelfId::FromString(id).app_id());
 }
 
 }  // namespace arc