blimp/client/core/contents/blimp_contents_manager.cc - Issue 2258563003: Added features to BlimpClientContext and BlimpContents

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: blimp/client/core/contents/blimp_contents_manager.cc

Issue 2258563003: Added features to BlimpClientContext and BlimpContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ime_feature_move

Patch Set: 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

« blimp/client/core/contents/android/blimp_contents_factory.cc ('K') | « blimp/client/core/contents/blimp_contents_manager.h ('k') | blimp/client/core/contents/blimp_contents_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 f0a1f6bf560da4167512eb7a99ba49eced4195f3..de9fd4fcebc521f76d4106935ce4d89e5f0d025b 100644

--- a/blimp/client/core/contents/blimp_contents_manager.cc

+++ b/blimp/client/core/contents/blimp_contents_manager.cc

@@ -51,10 +51,12 @@ BlimpContentsManager::BlimpContentsManager() : weak_ptr_factory_(this) {}

BlimpContentsManager::~BlimpContentsManager() {}

-std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents() {

+std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents(

+ NavigationFeature* nav_feature,

+ ImeFeature* ime_feature) {

int id = CreateBlimpContentsId();

std::unique_ptr<BlimpContentsImpl> new_contents =

- base::MakeUnique<BlimpContentsImpl>(id);

+ base::MakeUnique<BlimpContentsImpl>(id, nav_feature, ime_feature);

std::unique_ptr<BlimpContentsDeletionObserver> observer =

base::MakeUnique<BlimpContentsDeletionObserver>(this, new_contents.get());

observer_map_.insert(