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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 769363002: Initialize BrowserPluginGuest to attach to the View hierarchy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@basic_detach_plumbing
Patch Set: Don't initialize by default Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1189 NotificationService::AllBrowserContextsAndSources()); 1189 NotificationService::AllBrowserContextsAndSources());
1190 1190
1191 screen_orientation_dispatcher_host_.reset( 1191 screen_orientation_dispatcher_host_.reset(
1192 new ScreenOrientationDispatcherHostImpl(this)); 1192 new ScreenOrientationDispatcherHostImpl(this));
1193 1193
1194 manifest_manager_host_.reset(new ManifestManagerHost(this)); 1194 manifest_manager_host_.reset(new ManifestManagerHost(this));
1195 1195
1196 #if defined(OS_ANDROID) 1196 #if defined(OS_ANDROID)
1197 date_time_chooser_.reset(new DateTimeChooserAndroid()); 1197 date_time_chooser_.reset(new DateTimeChooserAndroid());
1198 #endif 1198 #endif
1199
1200 if (browser_plugin_guest_)
lazyboy 2014/12/04 16:51:13 You need to run Init() after |view_->CreateView()|
Fady Samuel 2014/12/04 20:54:44 Done.
1201 browser_plugin_guest_->Init();
1199 } 1202 }
1200 1203
1201 void WebContentsImpl::OnWebContentsDestroyed(WebContentsImpl* web_contents) { 1204 void WebContentsImpl::OnWebContentsDestroyed(WebContentsImpl* web_contents) {
1202 RemoveDestructionObserver(web_contents); 1205 RemoveDestructionObserver(web_contents);
1203 1206
1204 // Clear the opener if it has been closed. 1207 // Clear the opener if it has been closed.
1205 if (web_contents == opener_) { 1208 if (web_contents == opener_) {
1206 opener_ = NULL; 1209 opener_ = NULL;
1207 return; 1210 return;
1208 } 1211 }
(...skipping 3147 matching lines...) Expand 10 before | Expand all | Expand 10 after
4356 node->render_manager()->ResumeResponseDeferredAtStart(); 4359 node->render_manager()->ResumeResponseDeferredAtStart();
4357 } 4360 }
4358 4361
4359 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4362 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4360 force_disable_overscroll_content_ = force_disable; 4363 force_disable_overscroll_content_ = force_disable;
4361 if (view_) 4364 if (view_)
4362 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4365 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4363 } 4366 }
4364 4367
4365 } // namespace content 4368 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698