summaryrefslogtreecommitdiffstats
path: root/chrome/browser/custom_handlers
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 05:53:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 05:53:20 +0000
commit4ca153033f022dc6e11d6094daed41b1ed0a995f (patch)
treef4720517b10953166f84707ca3ec8b82de860884 /chrome/browser/custom_handlers
parent08bd3d71d969061b1588e6a4210f6d74b0ec0c6d (diff)
downloadchromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.zip
chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.gz
chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.bz2
Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've converted the easy ones, I'll do the ones with more dependencies in a separate change to keep things trivial to review.
I considered taking out GetSelectedTabContents altogether and having people just use GetSelectedTabContentsWrapper()->web_contents() per the existing comment in browser.h, but there are a lot of callers and it seemed too long to type. BUG=98716 TBR=joi Review URL: http://codereview.chromium.org/9015022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/custom_handlers')
-rw-r--r--chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
index bb01f818..7e09693 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc
@@ -16,6 +16,8 @@
#include "content/public/browser/navigation_entry.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
+using content::WebContents;
+
namespace {
class TestRenderViewContextMenu : public RenderViewContextMenu {
@@ -44,8 +46,8 @@ class RegisterProtocolHandlerBrowserTest : public InProcessBrowserTest {
params.media_type = WebKit::WebContextMenuData::MediaTypeNone;
params.link_url = url;
params.unfiltered_link_url = url;
- TabContents* tab_contents = browser()->GetSelectedTabContents();
- params.page_url = tab_contents->GetController().GetActiveEntry()->GetURL();
+ WebContents* web_contents = browser()->GetSelectedWebContents();
+ params.page_url = web_contents->GetController().GetActiveEntry()->GetURL();
#if defined(OS_MACOSX)
params.writing_direction_default = 0;
params.writing_direction_left_to_right = 0;