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

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

Issue 489763002: MacViews: Gets a webview working in views_examples_with_content_exe Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 6 years, 3 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 unified diff | Download patch | Annotate | Revision Log
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 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1141 // This is set before initializing the render manager since 1141 // This is set before initializing the render manager since
1142 // RenderFrameHostManager::Init calls back into us via its delegate to ask if 1142 // RenderFrameHostManager::Init calls back into us via its delegate to ask if
1143 // it should be hidden. 1143 // it should be hidden.
1144 should_normally_be_visible_ = !params.initially_hidden; 1144 should_normally_be_visible_ = !params.initially_hidden;
1145 1145
1146 GetRenderManager()->Init( 1146 GetRenderManager()->Init(
1147 params.browser_context, params.site_instance, params.routing_id, 1147 params.browser_context, params.site_instance, params.routing_id,
1148 params.main_frame_routing_id); 1148 params.main_frame_routing_id);
1149 1149
1150 WebContentsViewDelegate* delegate = 1150 WebContentsViewDelegate* delegate =
1151 GetContentClient()->browser()->GetWebContentsViewDelegate(this); 1151 GetContentClient()->browser()->GetWebContentsViewDelegate(this,
1152 params.context);
1152 1153
1153 if (browser_plugin_guest_) { 1154 if (browser_plugin_guest_) {
1154 scoped_ptr<WebContentsView> platform_view(CreateWebContentsView( 1155 scoped_ptr<WebContentsView> platform_view(CreateWebContentsView(
1155 this, delegate, &render_view_host_delegate_view_)); 1156 this, delegate, &render_view_host_delegate_view_));
1156 1157
1157 WebContentsViewGuest* rv = new WebContentsViewGuest( 1158 WebContentsViewGuest* rv = new WebContentsViewGuest(
1158 this, browser_plugin_guest_.get(), platform_view.Pass(), 1159 this, browser_plugin_guest_.get(), platform_view.Pass(),
1159 render_view_host_delegate_view_); 1160 render_view_host_delegate_view_);
1160 render_view_host_delegate_view_ = rv; 1161 render_view_host_delegate_view_ = rv;
1161 view_.reset(rv); 1162 view_.reset(rv);
(...skipping 3080 matching lines...) Expand 10 before | Expand all | Expand 10 after
4242 node->render_manager()->ResumeResponseDeferredAtStart(); 4243 node->render_manager()->ResumeResponseDeferredAtStart();
4243 } 4244 }
4244 4245
4245 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4246 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4246 force_disable_overscroll_content_ = force_disable; 4247 force_disable_overscroll_content_ = force_disable;
4247 if (view_) 4248 if (view_)
4248 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4249 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4249 } 4250 }
4250 4251
4251 } // namespace content 4252 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/base/web_ui_browser_test.cc ('k') | content/browser/web_contents/web_contents_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698