diff options
| author | derat <derat@chromium.org> | 2015-01-16 07:32:12 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-16 15:33:18 +0000 |
| commit | 49b2fd5d3c6ca2208a2ab1532f5dda491207d6c9 (patch) | |
| tree | 44c378000d63216135917d7a8f310e09d9d5f55f /chrome/browser/browser_process_impl.cc | |
| parent | cf05b9c331b78b6324869ceb347d45c8a3ed018a (diff) | |
| download | chromium_src-49b2fd5d3c6ca2208a2ab1532f5dda491207d6c9.zip chromium_src-49b2fd5d3c6ca2208a2ab1532f5dda491207d6c9.tar.gz chromium_src-49b2fd5d3c6ca2208a2ab1532f5dda491207d6c9.tar.bz2 | |
Move idle-related functions to ui/base/idle/.
Move CalculateIdleState(), CalculateIdleTime(), and
CheckIdleStateIsLocked() from chrome/browser/ to
ui/base/idle/. This will allow the chrome.idle API to be
moved to extensions/.
BUG=446320
Review URL: https://codereview.chromium.org/835873003
Cr-Commit-Position: refs/heads/master@{#311900}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 1f70dfd..880cf06 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -36,7 +36,6 @@ #include "chrome/browser/gpu/gl_string_manager.h" #include "chrome/browser/gpu/gpu_mode_manager.h" #include "chrome/browser/icon_manager.h" -#include "chrome/browser/idle.h" #include "chrome/browser/intranet_redirect_detector.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/lifetime/application_lifetime.h" @@ -92,6 +91,7 @@ #include "extensions/common/constants.h" #include "net/socket/client_socket_pool_manager.h" #include "net/url_request/url_request_context_getter.h" +#include "ui/base/idle/idle.h" #include "ui/base/l10n/l10n_util.h" #include "ui/message_center/message_center.h" @@ -195,7 +195,7 @@ BrowserProcessImpl::BrowserProcessImpl( chrome::kChromeSearchScheme); #if defined(OS_MACOSX) - InitIdleMonitor(); + ui::InitIdleMonitor(); #endif #if !defined(OS_ANDROID) |