diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 04:37:24 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 04:37:24 +0000 |
| commit | 64fbfe318caa5ed948b4fc76d20faab443510761 (patch) | |
| tree | e3ef9c520f12f777b227ed4debee8f62144b96a6 /chrome/browser/translate | |
| parent | 0d6e9bd0a2788f03f07f4b90a222fe06270b79b5 (diff) | |
| download | chromium_src-64fbfe318caa5ed948b4fc76d20faab443510761.zip chromium_src-64fbfe318caa5ed948b4fc76d20faab443510761.tar.gz chromium_src-64fbfe318caa5ed948b4fc76d20faab443510761.tar.bz2 | |
Move navigation_types.h from content/common to content/public/browser, and put it in the content namespace. There was no reason for it to be in common since it's only used by browser. I also updated the enum names to match the rest of the enums in the Content API.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8339006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate')
| -rw-r--r-- | chrome/browser/translate/translate_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/translate/translate_manager_browsertest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 0e76619c..6f5d663 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -281,7 +281,7 @@ void TranslateManager::Observe(int type, return; } if (entry->transition_type() != content::PAGE_TRANSITION_RELOAD && - load_details->type != NavigationType::SAME_PAGE) { + load_details->type != content::NAVIGATION_TYPE_SAME_PAGE) { return; } // When doing a page reload, we don't get a TAB_LANGUAGE_DETERMINED diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index c927578..c3acd10e 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -666,7 +666,7 @@ TEST_F(TranslateManagerTest, Reload) { const content::LoadCommittedDetails& nav_details = nav_observer.get_load_commited_details(); EXPECT_TRUE(nav_details.entry != NULL); // There was a navigation. - EXPECT_EQ(NavigationType::EXISTING_PAGE, nav_details.type); + EXPECT_EQ(content::NAVIGATION_TYPE_EXISTING_PAGE, nav_details.type); // The TranslateManager class processes the navigation entry committed // notification in a posted task; process that task. @@ -697,7 +697,7 @@ TEST_F(TranslateManagerTest, ReloadFromLocationBar) { const content::LoadCommittedDetails& nav_details = nav_observer.get_load_commited_details(); EXPECT_TRUE(nav_details.entry != NULL); // There was a navigation. - EXPECT_EQ(NavigationType::SAME_PAGE, nav_details.type); + EXPECT_EQ(content::NAVIGATION_TYPE_SAME_PAGE, nav_details.type); // The TranslateManager class processes the navigation entry committed // notification in a posted task; process that task. |