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

Unified Diff: content/browser/browser_context.cc

Issue 1815563004: Remove iOS ifdefs in src/content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 9 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 | « content/browser/browser_child_process_host_impl.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_context.cc
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index 10db382998c3675576aa9cbdb49f805c19fe317e..56382cae388453b46dfe3e7693b6ddb46aa0e2fb 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -14,8 +14,6 @@
#include "base/lazy_instance.h"
#include "base/rand_util.h"
#include "build/build_config.h"
-
-#if !defined(OS_IOS)
#include "components/profile_service/profile_app.h"
#include "content/browser/download/download_manager_impl.h"
#include "content/browser/fileapi/chrome_blob_storage_context.h"
@@ -35,14 +33,11 @@
#include "net/url_request/url_request_context_getter.h"
#include "storage/browser/database/database_tracker.h"
#include "storage/browser/fileapi/external_mount_points.h"
-#endif // !OS_IOS
using base::UserDataAdapter;
namespace content {
-// Only ~BrowserContext() is needed on iOS.
-#if !defined(OS_IOS)
namespace {
base::LazyInstance<std::set<std::string>> g_used_user_ids =
@@ -365,17 +360,13 @@ const std::string& BrowserContext::GetMojoUserIdFor(
return it->second;
}
-#endif // !OS_IOS
-
BrowserContext::~BrowserContext() {
CHECK(GetUserData(kMojoWasInitialized))
<< "Attempting to destroy a BrowserContext that never called "
<< "Initialize()";
-#if !defined(OS_IOS)
if (GetUserData(kDownloadManagerKeyName))
GetDownloadManager(this)->Shutdown();
-#endif
}
} // namespace content
« no previous file with comments | « content/browser/browser_child_process_host_impl.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698