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

chrome/browser/ui/ash/chrome_shell_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
 
 #include <string>
 
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shell_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/ui/ash/metrics/chrome_user_metrics_recorder.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
-#if defined(OS_CHROMEOS) && defined(ENABLE_ARC)
+#if defined(OS_CHROMEOS)
 #include "ash/shell_observer.h"
 #endif
 
 class Browser;
 
 namespace ash {
 class ShelfItemDelegate;
 }
 
 namespace content {
@@ skipping 53 matching lines @@
   gfx::Image GetDeprecatedAcceleratorImage() const override;
   void ToggleTouchpad() override;
   void ToggleTouchscreen() override;
 
   // content::NotificationObserver override:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
  private:
-#if defined(OS_CHROMEOS) && defined(ENABLE_ARC)
+#if defined(OS_CHROMEOS)
   // An Observer to track session state and start/stop ARC accordingly.
   class ArcSessionObserver : public ash::ShellObserver {
    public:
     ArcSessionObserver();
     ~ArcSessionObserver() override;
 
     // ash::ShellObserver overrides:
     void OnLoginStateChanged(ash::user::LoginStatus status) override;
 
    private:
@@ skipping 11 matching lines @@
 
   base::ObserverList<ash::VirtualKeyboardStateObserver>
       keyboard_state_observer_list_;
 
   // Proxies events from chrome/browser to ash::UserMetricsRecorder.
   scoped_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_;
 
 #if defined(OS_CHROMEOS)
   scoped_ptr<chromeos::DisplayConfigurationObserver>
       display_configuration_observer_;
-#endif
 
-#if defined(OS_CHROMEOS) && defined(ENABLE_ARC)
   // An Observer to track session state and start/stop ARC accordingly.
   scoped_ptr<ArcSessionObserver> arc_session_observer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_