Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(760)

Unified Diff: chrome/browser/media/media_stream_devices_controller.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
index 431af985362b043c48a232b1c535c8c0baebccfb..dd9ca2c58893a3c26a1405163a5ae7c761b843e1 100644
--- a/chrome/browser/media/media_stream_devices_controller.cc
+++ b/chrome/browser/media/media_stream_devices_controller.cc
@@ -31,7 +31,7 @@
#include "ui/base/l10n/l10n_util.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "components/user_manager/user_manager.h"
#endif
using content::BrowserThread;
@@ -86,7 +86,8 @@ bool IsInKioskMode() {
return true;
#if defined(OS_CHROMEOS)
- const chromeos::UserManager* user_manager = chromeos::UserManager::Get();
+ const user_manager::UserManager* user_manager =
+ user_manager::UserManager::Get();
return user_manager && user_manager->IsLoggedInAsKioskApp();
#else
return false;
« no previous file with comments | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/media_galleries/gallery_watch_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698