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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 444813002: Remove BrowserPlugin's -internal-attach method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: All tests pass Created 6 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 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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2229 matching lines...) Expand 10 before | Expand all | Expand 10 after
2240 &ssl_status.security_bits, 2240 &ssl_status.security_bits,
2241 &ssl_status.connection_status, 2241 &ssl_status.connection_status,
2242 &ssl_status.signed_certificate_timestamp_ids); 2242 &ssl_status.signed_certificate_timestamp_ids);
2243 return ssl_status; 2243 return ssl_status;
2244 } 2244 }
2245 2245
2246 const std::string& RenderViewImpl::GetAcceptLanguages() const { 2246 const std::string& RenderViewImpl::GetAcceptLanguages() const {
2247 return renderer_preferences_.accept_languages; 2247 return renderer_preferences_.accept_languages;
2248 } 2248 }
2249 2249
2250 void RenderViewImpl::AttachToBrowserPlugin(int browser_plugin_instance_id,
2251 int guest_instance_id) {
2252 GetBrowserPluginManager()->Attach(browser_plugin_instance_id,
2253 guest_instance_id);
2254 }
2255
2250 void RenderViewImpl::didCreateDataSource(WebLocalFrame* frame, 2256 void RenderViewImpl::didCreateDataSource(WebLocalFrame* frame,
2251 WebDataSource* ds) { 2257 WebDataSource* ds) {
2252 bool content_initiated = !pending_navigation_params_.get(); 2258 bool content_initiated = !pending_navigation_params_.get();
2253 2259
2254 // Make sure any previous redirect URLs end up in our new data source. 2260 // Make sure any previous redirect URLs end up in our new data source.
2255 if (pending_navigation_params_.get()) { 2261 if (pending_navigation_params_.get()) {
2256 for (std::vector<GURL>::const_iterator i = 2262 for (std::vector<GURL>::const_iterator i =
2257 pending_navigation_params_->redirects.begin(); 2263 pending_navigation_params_->redirects.begin();
2258 i != pending_navigation_params_->redirects.end(); ++i) { 2264 i != pending_navigation_params_->redirects.end(); ++i) {
2259 ds->appendRedirect(*i); 2265 ds->appendRedirect(*i);
(...skipping 2051 matching lines...) Expand 10 before | Expand all | Expand 10 after
4311 std::vector<gfx::Size> sizes; 4317 std::vector<gfx::Size> sizes;
4312 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4318 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4313 if (!url.isEmpty()) 4319 if (!url.isEmpty())
4314 urls.push_back( 4320 urls.push_back(
4315 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4321 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4316 } 4322 }
4317 SendUpdateFaviconURL(urls); 4323 SendUpdateFaviconURL(urls);
4318 } 4324 }
4319 4325
4320 } // namespace content 4326 } // namespace content
OLDNEW
« chrome/browser/guest_view/guest_view_base.h ('K') | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698