arc-bridge: Enable ARC with a command-line flag

chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

 // Copyright 2013 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/ash/chrome_shell_delegate.h"
 
 #include "ash/accelerators/magnifier_key_scroller.h"
 #include "ash/accelerators/spoken_feedback_toggler.h"
 #include "ash/accessibility_delegate.h"
 #include "ash/wm/mru_window_tracker.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/media_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
+#include "components/arc/arc_bridge_service.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(ENABLE_ARC)
-#include "components/arc/arc_bridge_service.h"
-#endif
-
 namespace {
 
 void InitAfterFirstSessionStart() {
   // Restore focus after the user session is started.  It's needed because some
   // windows can be opened in background while login UI is still active because
   // we currently restore browser windows before login UI is deleted.
   ash::Shell* shell = ash::Shell::GetInstance();
   ash::MruWindowTracker::WindowList mru_list =
       shell->mru_window_tracker()->BuildMruWindowList();
   if (!mru_list.empty())
@@ skipping 166 matching lines @@
 
 void ChromeShellDelegate::PreInit() {
   chromeos::LoadDisplayPreferences(IsFirstRunAfterBoot());
   // Object owns itself, and deletes itself when Observer::OnShutdown is called:
   new policy::DisplayRotationDefaultHandler();
   // Set the observer now so that we can save the initial state
   // in Shell::Init.
   display_configuration_observer_.reset(
       new chromeos::DisplayConfigurationObserver());
 
-#if defined(ENABLE_ARC)
   arc_session_observer_.reset(new ArcSessionObserver);
-#endif
 
   chrome_user_metrics_recorder_.reset(new ChromeUserMetricsRecorder);
 }
 
 void ChromeShellDelegate::PreShutdown() {
   display_configuration_observer_.reset();
 
-#if defined(ENABLE_ARC)
   // Remove the ARC observer now since it uses the ash::Shell instance in its
   // destructor, which is unavailable after PreShutdown() returns.
   arc_session_observer_.reset();
-#endif
 
   chrome_user_metrics_recorder_.reset();
 }
 
 ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
   return new SessionStateDelegateChromeos;
 }
 
 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() {
   return new AccessibilityDelegateImpl;
@@ skipping 49 matching lines @@
 
 void ChromeShellDelegate::PlatformInit() {
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
 }
 
-#if defined(ENABLE_ARC)
 ChromeShellDelegate::ArcSessionObserver::ArcSessionObserver() {
   ash::Shell::GetInstance()->AddShellObserver(this);
 }
 
 ChromeShellDelegate::ArcSessionObserver::~ArcSessionObserver() {
   ash::Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 void ChromeShellDelegate::ArcSessionObserver::OnLoginStateChanged(
     ash::user::LoginStatus status) {
   switch (status) {
     case ash::user::LOGGED_IN_LOCKED:
     case ash::user::LOGGED_IN_KIOSK_APP:
       return;
 
     case ash::user::LOGGED_IN_NONE:
       arc::ArcBridgeService::Get()->Shutdown();
       break;
 
     case ash::user::LOGGED_IN_USER:
     case ash::user::LOGGED_IN_OWNER:
     case ash::user::LOGGED_IN_GUEST:
     case ash::user::LOGGED_IN_PUBLIC:
     case ash::user::LOGGED_IN_SUPERVISED:
-      arc::ArcBridgeService::Get()->HandleStartup();
+      if (arc::ArcBridgeService::GetEnabled(
+              base::CommandLine::ForCurrentProcess())) {
+        arc::ArcBridgeService::Get()->HandleStartup();
+      }
       break;
   }
 }
-#endif