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

Unified Diff: chrome/browser/geolocation/geolocation_browsertest.cc

Issue 8983012: Get rid of content::NavigationController in cc file and use "using" instead. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/favicon/favicon_tab_helper.cc ('k') | chrome/browser/google/google_url_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/geolocation/geolocation_browsertest.cc
===================================================================
--- chrome/browser/geolocation/geolocation_browsertest.cc (revision 116288)
+++ chrome/browser/geolocation/geolocation_browsertest.cc (working copy)
@@ -35,6 +35,7 @@
#include "net/base/net_util.h"
#include "net/test/test_server.h"
+using content::NavigationController;
using content::WebContents;
namespace {
@@ -48,10 +49,10 @@
IFrameLoader(Browser* browser, int iframe_id, const GURL& url)
: navigation_completed_(false),
javascript_completed_(false) {
- content::NavigationController* controller =
+ NavigationController* controller =
&browser->GetSelectedWebContents()->GetController();
registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(controller));
+ content::Source<NavigationController>(controller));
registrar_.Add(this, chrome::NOTIFICATION_DOM_OPERATION_RESPONSE,
content::NotificationService::AllSources());
std::string script = base::StringPrintf(
@@ -326,7 +327,7 @@
{
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&tab_contents_wrapper->web_contents()->GetController()));
if (allowed)
infobar_->AsConfirmInfoBarDelegate()->Accept();
@@ -509,7 +510,7 @@
Geoposition fresh_position = GeopositionFromLatLong(3.17, 4.23);
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&current_browser_->GetSelectedWebContents()->GetController()));
NotifyGeoposition(fresh_position);
observer.Wait();
@@ -546,7 +547,7 @@
Geoposition cached_position = GeopositionFromLatLong(5.67, 8.09);
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&current_browser_->GetSelectedWebContents()->GetController()));
NotifyGeoposition(cached_position);
observer.Wait();
@@ -654,7 +655,7 @@
// its way through to the first watcher.
ui_test_utils::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&current_browser_->GetSelectedWebContents()->GetController()));
NotifyGeoposition(final_position);
observer.Wait();
« no previous file with comments | « chrome/browser/favicon/favicon_tab_helper.cc ('k') | chrome/browser/google/google_url_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698