Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 273f864216521154bca581126385875967bd4a02..ba58c073bbb3677924c1d817d8e7b37df3b961c3 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -7,6 +7,7 @@ |
#include <utility> |
#include "base/command_line.h" |
+#include "base/debug/stack_trace.h" |
Fady Samuel
2015/11/24 04:42:38
Delete this.
|
#include "base/lazy_instance.h" |
#include "base/location.h" |
#include "base/logging.h" |
@@ -417,6 +418,7 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context) |
#endif |
wake_lock_service_context_.reset(new WakeLockServiceContext(this)); |
+ // base::debug::StackTrace().Print(); |
Fady Samuel
2015/11/24 04:42:38
Delete this.
|
} |
WebContentsImpl::~WebContentsImpl() { |
@@ -534,6 +536,7 @@ WebContentsImpl* WebContentsImpl::CreateWithOpener( |
// bit to true. |
new_contents->is_subframe_ = true; |
} |
+ |
new_contents->Init(params); |
return new_contents; |
} |
@@ -1378,8 +1381,9 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { |
#if defined(MOJO_SHELL_CLIENT) |
if (MojoShellConnection::Get() && |
base::CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kUseMusInRenderer)) { |
- view_.reset(new WebContentsViewMus(this, view_.Pass(), |
+ switches::kUseMusInRenderer) && |
+ params.mus_window) { |
+ view_.reset(new WebContentsViewMus(this, params.mus_window, view_.Pass(), |
&render_view_host_delegate_view_)); |
} |
#endif |