summaryrefslogtreecommitdiffstats
path: root/chrome/browser/translate
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-04 17:07:50 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-04 17:07:50 +0000
commitc5eed4976490f601ad01f36e102260744c673b2d (patch)
tree64fb05d9ecf101bf0dc4460ecd26b56637b4e8d7 /chrome/browser/translate
parent8c64d197edc97f4cd646cff55a21af0b4733b942 (diff)
downloadchromium_src-c5eed4976490f601ad01f36e102260744c673b2d.zip
chromium_src-c5eed4976490f601ad01f36e102260744c673b2d.tar.gz
chromium_src-c5eed4976490f601ad01f36e102260744c673b2d.tar.bz2
Get rid of content::NavigationController in cc file and use "using" instead.
BUG=98716 TBR=joi Review URL: http://codereview.chromium.org/8983012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate')
-rw-r--r--chrome/browser/translate/translate_manager.cc5
-rw-r--r--chrome/browser/translate/translate_manager_browsertest.cc3
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index d87d91f..8fd0c4f 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -50,6 +50,7 @@
#include "net/url_request/url_request_status.h"
#include "ui/base/resource/resource_bundle.h"
+using content::NavigationController;
using content::NavigationEntry;
using content::WebContents;
@@ -261,8 +262,8 @@ void TranslateManager::Observe(int type,
const content::NotificationDetails& details) {
switch (type) {
case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
- content::NavigationController* controller =
- content::Source<content::NavigationController>(source).ptr();
+ NavigationController* controller =
+ content::Source<NavigationController>(source).ptr();
content::LoadCommittedDetails* load_details =
content::Details<content::LoadCommittedDetails>(details).ptr();
NavigationEntry* entry = controller->GetActiveEntry();
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 9078736..67e44c0 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -46,6 +46,7 @@
#endif
using content::BrowserThread;
+using content::NavigationController;
using content::WebContents;
using testing::_;
using testing::Pointee;
@@ -269,7 +270,7 @@ class NavEntryCommittedObserver : public content::NotificationObserver {
public:
explicit NavEntryCommittedObserver(TabContents* tab_contents) {
registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
- content::Source<content::NavigationController>(
+ content::Source<NavigationController>(
&tab_contents->GetController()));
}