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

Unified Diff: blimp/client/core/contents/blimp_contents_manager.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/contents/blimp_contents_manager.cc
diff --git a/blimp/client/core/contents/blimp_contents_manager.cc b/blimp/client/core/contents/blimp_contents_manager.cc
index 6778bb18fd3680cab3f7b3eb541944fd5375531d..52214d4e6838650b6f798e42033feeb566f01b35 100644
--- a/blimp/client/core/contents/blimp_contents_manager.cc
+++ b/blimp/client/core/contents/blimp_contents_manager.cc
@@ -63,7 +63,8 @@ BlimpContentsManager::BlimpContentsManager(
BlimpContentsManager::~BlimpContentsManager() {}
-std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents() {
+std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents(
+ gfx::NativeWindow window) {
if (tab_exists_) return nullptr;
tab_exists_ = true;
@@ -71,8 +72,8 @@ std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents() {
std::unique_ptr<BlimpContentsImpl> new_contents =
base::MakeUnique<BlimpContentsImpl>(
- id, blimp_compositor_dependencies_, ime_feature_, navigation_feature_,
- render_widget_feature_, tab_control_feature_);
+ id, window, blimp_compositor_dependencies_, ime_feature_,
+ navigation_feature_, render_widget_feature_, tab_control_feature_);
// Create an observer entry for the contents.
std::unique_ptr<BlimpContentsDeletionObserver> observer =
« no previous file with comments | « blimp/client/core/contents/blimp_contents_manager.h ('k') | blimp/client/core/contents/blimp_contents_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698