Revert 264067 "app_shell: Initialize chromeos::DBusThreadManager."

> app_shell: Initialize chromeos::DBusThreadManager.
> 
> Let app_shell communicate with Chrome OS system processes.
> Also start notifying the power manager about user activity.
> 
> BUG=354711
> TBR=sky@chromium.org
> 
> Review URL: https://codereview.chromium.org/239433002

TBR=derat@chromium.org

Review URL: https://codereview.chromium.org/239823003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264071 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 5 insertions, 52 deletions

diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp
index 95a1a2b..368b97b 100644
--- a/apps/shell/app_shell.gyp
+++ b/apps/shell/app_shell.gyp
@@ -77,7 +77,6 @@
         '<(DEPTH)/extensions/extensions.gyp:extensions_renderer',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
-        '<(DEPTH)/ui/wm/wm.gyp:wm_core',
         '<(DEPTH)/ui/wm/wm.gyp:wm_test_support',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
       ],
@@ -121,13 +120,6 @@
         'renderer/shell_content_renderer_client.cc',
         'renderer/shell_content_renderer_client.h',
       ],
-      'conditions': [
-        ['chromeos==1', {
-          'dependencies': [
-            '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'app_shell',
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc
index c886b74..9ce8a1c 100644
--- a/apps/shell/browser/shell_browser_main_parts.cc
+++ b/apps/shell/browser/shell_browser_main_parts.cc
@@ -23,10 +23,6 @@
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if defined(OS_CHROMEOS)
-#include "chromeos/dbus/dbus_thread_manager.h"
-#endif
-
 using content::BrowserContext;
 using extensions::Extension;
 using extensions::ExtensionSystem;
@@ -59,9 +55,6 @@ void ShellBrowserMainParts::PreMainMessageLoopStart() {
 }
 
 void ShellBrowserMainParts::PostMainMessageLoopStart() {
-#if defined(OS_CHROMEOS)
-  chromeos::DBusThreadManager::Initialize();
-#endif
 }
 
 void ShellBrowserMainParts::PreEarlyInitialization() {
@@ -142,12 +135,6 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
   desktop_controller_.reset();
 }
 
-void ShellBrowserMainParts::PostDestroyThreads() {
-#if defined(OS_CHROMEOS)
-  chromeos::DBusThreadManager::Shutdown();
-#endif
-}
-
 void ShellBrowserMainParts::OnHostCloseRequested(
     const aura::WindowTreeHost* host) {
   desktop_controller_->CloseAppWindow();
diff --git a/apps/shell/browser/shell_browser_main_parts.h b/apps/shell/browser/shell_browser_main_parts.h
index 8ae3fe4..f5082e1 100644
--- a/apps/shell/browser/shell_browser_main_parts.h
+++ b/apps/shell/browser/shell_browser_main_parts.h
@@ -61,7 +61,6 @@ class ShellBrowserMainParts : public content::BrowserMainParts,
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
-  virtual void PostDestroyThreads() OVERRIDE;
 
   // aura::WindowTreeHostObserver overrides:
   virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) OVERRIDE;
diff --git a/apps/shell/browser/shell_desktop_controller.cc b/apps/shell/browser/shell_desktop_controller.cc
index cc287c9..d369b5b 100644
--- a/apps/shell/browser/shell_desktop_controller.cc
+++ b/apps/shell/browser/shell_desktop_controller.cc
@@ -10,14 +10,11 @@
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/gfx/screen.h"
-#include "ui/wm/core/user_activity_detector.h"
 #include "ui/wm/test/wm_test_helper.h"
 
 #if defined(OS_CHROMEOS)
-#include "ui/chromeos/user_activity_power_manager_notifier.h"
 #include "ui/display/types/chromeos/display_mode.h"
 #include "ui/display/types/chromeos/display_snapshot.h"
 #endif
@@ -72,14 +69,6 @@ ShellDesktopController::ShellDesktopController() {
 #endif
   CreateRootWindow();
 
-  user_activity_detector_.reset(new wm::UserActivityDetector);
-  GetWindowTreeHost()->event_processor()->GetRootTarget()->AddPreTargetHandler(
-      user_activity_detector_.get());
-#if defined(OS_CHROMEOS)
-  user_activity_notifier_.reset(
-      new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get()));
-#endif
-
   g_instance = this;
 }
 
@@ -87,8 +76,6 @@ ShellDesktopController::~ShellDesktopController() {
   // The app window must be explicitly closed before desktop teardown.
   DCHECK(!app_window_);
   g_instance = NULL;
-  GetWindowTreeHost()->event_processor()->GetRootTarget()
-      ->RemovePreTargetHandler(user_activity_detector_.get());
   DestroyRootWindow();
   aura::Env::DeleteInstance();
 }
@@ -121,7 +108,7 @@ aura::WindowTreeHost* ShellDesktopController::GetWindowTreeHost() {
 
 #if defined(OS_CHROMEOS)
 void ShellDesktopController::OnDisplayModeChanged(
-    const std::vector<ui::DisplayConfigurator::DisplayState>& displays) {
+    const std::vector<ui::DisplayConfigurator::DisplayState>& outputs) {
   gfx::Size size = GetPrimaryDisplaySize();
   if (!size.IsEmpty())
     wm_test_helper_->host()->UpdateRootWindowSize(size);
@@ -156,11 +143,11 @@ void ShellDesktopController::DestroyRootWindow() {
 
 gfx::Size ShellDesktopController::GetPrimaryDisplaySize() {
 #if defined(OS_CHROMEOS)
-  const std::vector<ui::DisplayConfigurator::DisplayState>& displays =
+  const std::vector<ui::DisplayConfigurator::DisplayState>& states =
       display_configurator_->cached_displays();
-  if (displays.empty())
+  if (states.empty())
     return gfx::Size();
-  const ui::DisplayMode* mode = displays[0].display->current_mode();
+  const ui::DisplayMode* mode = states[0].display->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
diff --git a/apps/shell/browser/shell_desktop_controller.h b/apps/shell/browser/shell_desktop_controller.h
index 643f671..02b0a34 100644
--- a/apps/shell/browser/shell_desktop_controller.h
+++ b/apps/shell/browser/shell_desktop_controller.h
@@ -24,14 +24,7 @@ namespace content {
 class BrowserContext;
 }
 
-#if defined(OS_CHROMEOS)
-namespace ui {
-class UserActivityPowerManagerNotifier;
-}
-#endif
-
 namespace wm {
-class UserActivityDetector;
 class WMTestHelper;
 }
 
@@ -67,7 +60,7 @@ class ShellDesktopController
 #if defined(OS_CHROMEOS)
   // ui::DisplayConfigurator::Observer overrides.
   virtual void OnDisplayModeChanged(const std::vector<
-      ui::DisplayConfigurator::DisplayState>& displays) OVERRIDE;
+      ui::DisplayConfigurator::DisplayState>& outputs) OVERRIDE;
 #endif
 
  private:
@@ -90,11 +83,6 @@ class ShellDesktopController
 
   scoped_ptr<aura::TestScreen> test_screen_;
 
-  scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
-#if defined(OS_CHROMEOS)
-  scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
-#endif
-
   // The desktop supports a single app window.
   scoped_ptr<ShellAppWindow> app_window_;