diff options
Diffstat (limited to 'android_webview/native/aw_contents.cc')
| -rw-r--r-- | android_webview/native/aw_contents.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index b78ba79..10c21da 100644 --- a/android_webview/native/aw_contents.cc +++ b/android_webview/native/aw_contents.cc @@ -40,6 +40,7 @@ #include "base/atomicops.h" #include "base/bind.h" #include "base/callback.h" +#include "base/command_line.h" #include "base/memory/memory_pressure_listener.h" #include "base/message_loop/message_loop.h" #include "base/pickle.h" @@ -62,6 +63,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "content/public/common/content_switches.h" #include "content/public/common/message_port_types.h" #include "content/public/common/renderer_preferences.h" #include "content/public/common/ssl_status.h" @@ -204,8 +206,12 @@ AwContents::AwContents(scoped_ptr<WebContents> web_contents) InitDataReductionProxyIfNecessary(); if (autofill_manager_delegate) InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData()); - content::SynchronousCompositor::SetClientForWebContents( - web_contents_.get(), &browser_view_renderer_); + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kSingleProcess)) { + // TODO(boliu): Figure out how to deal with this more nicely. + content::SynchronousCompositor::SetClientForWebContents( + web_contents_.get(), &browser_view_renderer_); + } if (current_instance_count == 1) AwWebViewLifecycleObserver::OnFirstWebViewCreated(); } |