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

Unified Diff: blimp/client/core/blimp_client_context_impl.cc

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)
Patch Set: addressed nit, renamed CreateForTesting and piped through touch handling Created 4 years, 4 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: blimp/client/core/blimp_client_context_impl.cc
diff --git a/blimp/client/core/blimp_client_context_impl.cc b/blimp/client/core/blimp_client_context_impl.cc
index 25e5360a2fe9a19dc967bf17dddb0cdaa0acfae5..75ab73c39e9adbf027ad76741b8724d73f87642f 100644
--- a/blimp/client/core/blimp_client_context_impl.cc
+++ b/blimp/client/core/blimp_client_context_impl.cc
@@ -21,6 +21,7 @@
#include "blimp/client/core/settings/settings_feature.h"
#include "blimp/client/public/blimp_client_context_delegate.h"
#include "blimp/client/public/compositor/compositor_dependencies.h"
+#include "ui/gfx/native_widget_types.h"
#if defined(OS_ANDROID)
#include "blimp/client/core/android/blimp_client_context_impl_android.h"
@@ -103,9 +104,10 @@ void BlimpClientContextImpl::SetDelegate(BlimpClientContextDelegate* delegate) {
delegate_ = delegate;
}
-std::unique_ptr<BlimpContents> BlimpClientContextImpl::CreateBlimpContents() {
+std::unique_ptr<BlimpContents> BlimpClientContextImpl::CreateBlimpContents(
+ gfx::NativeWindow window) {
std::unique_ptr<BlimpContents> blimp_contents =
- blimp_contents_manager_->CreateBlimpContents();
+ blimp_contents_manager_->CreateBlimpContents(window);
if (blimp_contents)
delegate_->AttachBlimpContentsHelpers(blimp_contents.get());
return blimp_contents;
« no previous file with comments | « blimp/client/core/blimp_client_context_impl.h ('k') | blimp/client/core/blimp_client_context_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698