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

Unified Diff: chrome/browser/ui/ash/chrome_shell_content_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
Index: chrome/browser/ui/ash/chrome_shell_content_state.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_content_state.cc b/chrome/browser/ui/ash/chrome_shell_content_state.cc
index a7205714d50e841ff964dea3c15ef25815a5fe06..4de2fe820ffdc90203871ca1d4423510ff36cd99 100644
--- a/chrome/browser/ui/ash/chrome_shell_content_state.cc
+++ b/chrome/browser/ui/ash/chrome_shell_content_state.cc
@@ -6,18 +6,13 @@
#include "build/build_config.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "content/public/browser/browser_context.h"
-
-#if defined(OS_CHROMEOS)
#include "components/user_manager/user_manager.h"
-#endif
+#include "content/public/browser/browser_context.h"
ChromeShellContentState::ChromeShellContentState() {}
ChromeShellContentState::~ChromeShellContentState() {}
content::BrowserContext* ChromeShellContentState::GetActiveBrowserContext() {
-#if defined(OS_CHROMEOS)
DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size());
-#endif
return ProfileManager::GetActiveUserProfile();
}
« no previous file with comments | « chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc ('k') | chrome/browser/ui/ash/chrome_shell_content_state_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698