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

Unified Diff: chrome/browser/ui/ash/app_sync_ui_state.cc

Issue 1960293003: Remove OS_CHROMEOS from ui/ash code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_service_ash.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/app_sync_ui_state.cc
diff --git a/chrome/browser/ui/ash/app_sync_ui_state.cc b/chrome/browser/ui/ash/app_sync_ui_state.cc
index f7c65e86448822de75201c5e1794bdd6659ae340..3d4cca3190c4d33bb715853dd749780c24ecf147 100644
--- a/chrome/browser/ui/ash/app_sync_ui_state.cc
+++ b/chrome/browser/ui/ash/app_sync_ui_state.cc
@@ -13,13 +13,10 @@
#include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
#include "components/browser_sync/browser/profile_sync_service.h"
#include "components/prefs/pref_service.h"
+#include "components/user_manager/user_manager.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
-#if defined(OS_CHROMEOS)
-#include "components/user_manager/user_manager.h"
-#endif
-
namespace {
// Max loading animation time in milliseconds.
@@ -34,7 +31,6 @@ AppSyncUIState* AppSyncUIState::Get(Profile* profile) {
// static
bool AppSyncUIState::ShouldObserveAppSyncForProfile(Profile* profile) {
-#if defined(OS_CHROMEOS)
if (user_manager::UserManager::Get()->IsLoggedInAsGuest())
return false;
@@ -45,9 +41,6 @@ bool AppSyncUIState::ShouldObserveAppSyncForProfile(Profile* profile) {
return false;
return profile->IsNewProfile();
-#else
- return false;
-#endif
}
AppSyncUIState::AppSyncUIState(Profile* profile)
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_service_ash.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698