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

Unified Diff: content/app/content_main_runner.cc

Issue 2567113002: Adds ability to specify how aura::Env is created in content (Closed)
Patch Set: more ifdef Created 4 years 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 | « no previous file | 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/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 929756b451ea3291c76c049a55c183421d64f02a..604acb0165115bce865463c258eee0a876ab3495 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -453,6 +453,10 @@ class ContentMainRunnerImpl : public ContentMainRunner {
int Initialize(const ContentMainParams& params) override {
ui_task_ = params.ui_task;
+#if defined(USE_AURA)
+ env_mode_ = params.env_mode;
+#endif
+
base::EnableTerminationOnOutOfMemory();
#if defined(OS_WIN)
base::win::RegisterInvalidParamHandler();
@@ -782,6 +786,9 @@ class ContentMainRunnerImpl : public ContentMainRunner {
#elif defined(OS_MACOSX)
main_params.autorelease_pool = autorelease_pool_.get();
#endif
+#if defined(USE_AURA)
+ main_params.env_mode = env_mode_;
+#endif
return RunNamedProcessTypeMain(process_type, main_params, delegate_);
}
@@ -840,6 +847,10 @@ class ContentMainRunnerImpl : public ContentMainRunner {
base::Closure* ui_task_;
+#if defined(USE_AURA)
+ aura::Env::Mode env_mode_ = aura::Env::Mode::LOCAL;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
};
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698