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

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

Issue 10982068: Browser Plugin: Remove unnecessary references to frame_id (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 2351 matching lines...) Expand 10 before | Expand all | Expand 10 after
2362 2362
2363 void WebContentsImpl::OnPpapiBrokerPermissionResult(int request_id, 2363 void WebContentsImpl::OnPpapiBrokerPermissionResult(int request_id,
2364 bool result) { 2364 bool result) {
2365 RenderViewHostImpl* rvh = GetRenderViewHostImpl(); 2365 RenderViewHostImpl* rvh = GetRenderViewHostImpl();
2366 rvh->Send(new ViewMsg_PpapiBrokerPermissionResult(rvh->GetRoutingID(), 2366 rvh->Send(new ViewMsg_PpapiBrokerPermissionResult(rvh->GetRoutingID(),
2367 request_id, 2367 request_id,
2368 result)); 2368 result));
2369 } 2369 }
2370 2370
2371 void WebContentsImpl::OnBrowserPluginNavigateGuest(int instance_id, 2371 void WebContentsImpl::OnBrowserPluginNavigateGuest(int instance_id,
2372 int64 frame_id,
2373 const std::string& src, 2372 const std::string& src,
2374 const gfx::Size& size) { 2373 const gfx::Size& size) {
2375 // This is the first 'navigate' to a browser plugin, before WebContents has/is 2374 // This is the first 'navigate' to a browser plugin, before WebContents has/is
2376 // an 'Embedder'; subsequent navigate messages for this WebContents will 2375 // an 'Embedder'; subsequent navigate messages for this WebContents will
2377 // be handled by the BrowserPluginEmbedderHelper of the embedder itself (this 2376 // be handled by the BrowserPluginEmbedderHelper of the embedder itself (this
2378 // also means any message from browser plugin renderer prior to NavigateGuest 2377 // also means any message from browser plugin renderer prior to NavigateGuest
2379 // which is not NavigateGuest will be ignored). Therefore 2378 // which is not NavigateGuest will be ignored). Therefore
2380 // |browser_plugin_embedder_| should not be set. 2379 // |browser_plugin_embedder_| should not be set.
2381 // For more info, see comment above classes BrowserPluginEmbedder and 2380 // For more info, see comment above classes BrowserPluginEmbedder and
2382 // BrowserPluginGuest. 2381 // BrowserPluginGuest.
2383 CHECK(!browser_plugin_embedder_.get()); 2382 CHECK(!browser_plugin_embedder_.get());
2384 2383
2385 browser_plugin_embedder_.reset( 2384 browser_plugin_embedder_.reset(
2386 content::BrowserPluginEmbedder::Create(this, GetRenderViewHost())); 2385 content::BrowserPluginEmbedder::Create(this, GetRenderViewHost()));
2387 browser_plugin_embedder_->NavigateGuest(GetRenderViewHost(), 2386 browser_plugin_embedder_->NavigateGuest(GetRenderViewHost(),
2388 instance_id, 2387 instance_id,
2389 frame_id,
2390 src, 2388 src,
2391 size); 2389 size);
2392 } 2390 }
2393 2391
2394 // Notifies the RenderWidgetHost instance about the fact that the page is 2392 // Notifies the RenderWidgetHost instance about the fact that the page is
2395 // loading, or done loading and calls the base implementation. 2393 // loading, or done loading and calls the base implementation.
2396 void WebContentsImpl::SetIsLoading(bool is_loading, 2394 void WebContentsImpl::SetIsLoading(bool is_loading,
2397 LoadNotificationDetails* details) { 2395 LoadNotificationDetails* details) {
2398 if (is_loading == is_loading_) 2396 if (is_loading == is_loading_)
2399 return; 2397 return;
(...skipping 993 matching lines...) Expand 10 before | Expand all | Expand 10 after
3393 } 3391 }
3394 } 3392 }
3395 3393
3396 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3394 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3397 return browser_plugin_guest_.get(); 3395 return browser_plugin_guest_.get();
3398 } 3396 }
3399 3397
3400 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3398 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3401 return browser_plugin_embedder_.get(); 3399 return browser_plugin_embedder_.get();
3402 } 3400 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/browser_plugin_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698