Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

chrome/browser/idle_chromeos.cc

Index: chrome/browser/idle_chromeos.cc
diff --git a/chrome/browser/idle_chromeos.cc b/chrome/browser/idle_chromeos.cc
index ee9e055c31a80c0286c8c51c6bccb23464b4dd57..e8eb0ef3d6fd969aec1d08db493fb5b4fb780538 100644
--- a/chrome/browser/idle_chromeos.cc
+++ b/chrome/browser/idle_chromeos.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,11 +6,8 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
-#if !defined(USE_AURA)
-#include "chrome/browser/screensaver_window_finder_gtk.h"
-#endif
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/power_manager_client.h"
 
 void CalculateIdleStateNotifier(unsigned int idle_treshold,
                                 IdleCallback notify,
@@ -25,21 +22,11 @@ void CalculateIdleStateNotifier(unsigned int idle_treshold,
 }
 
 void CalculateIdleState(unsigned int idle_threshold, IdleCallback notify) {
-  if (CheckIdleStateIsLocked()) {
-    notify.Run(IDLE_STATE_LOCKED);
-    return;
-  }
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       CalculateIdleTime(base::Bind(&CalculateIdleStateNotifier, idle_threshold,
                                    notify));
 }
 
 bool CheckIdleStateIsLocked() {
-  // Usually the screensaver is used to lock the screen, so we do not need to
-  // check if the workstation is locked.

[oshima, 2012/04/06 00:58:09]

Please keep this comment. Please add TODO(oshima) and say verify if this
behavior is correct.

[hashimoto, 2012/04/06 01:06:07]

Done.

-#if defined(USE_AURA)
   return false;
-#else
-  return ScreensaverWindowFinder::ScreensaverWindowExists();
-#endif
 }