Revert 106029

Broke http://build.chromium.org/p/chromium.perf/console
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

TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8333018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106054 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc
index 330eca5..42976f7 100644
--- a/chrome/browser/printing/print_preview_tab_controller.cc
+++ b/chrome/browser/printing/print_preview_tab_controller.cc
@@ -197,11 +197,11 @@ void PrintPreviewTabController::OnNavEntryCommitted(
   bool source_tab_is_preview_tab = (tab == preview_tab);
   if (details) {
     content::PageTransition transition_type = details->entry->transition_type();
-    content::NavigationType nav_type = details->type;
+    NavigationType::Type nav_type = details->type;
 
     // Don't update/erase the map entry if the page has not changed.
     if (transition_type == content::PAGE_TRANSITION_RELOAD ||
-        nav_type == content::NAVIGATION_TYPE_SAME_PAGE) {
+        nav_type == NavigationType::SAME_PAGE) {
       if (source_tab_is_preview_tab)
         SetInitiatorTabURLAndTitle(preview_tab);
       return;
@@ -210,7 +210,7 @@ void PrintPreviewTabController::OnNavEntryCommitted(
     // New |preview_tab| is created. Don't update/erase map entry.
     if (waiting_for_new_preview_page_ &&
         transition_type == content::PAGE_TRANSITION_LINK &&
-        nav_type == content::NAVIGATION_TYPE_NEW_PAGE &&
+        nav_type == NavigationType::NEW_PAGE &&
         source_tab_is_preview_tab) {
       waiting_for_new_preview_page_ = false;
       SetInitiatorTabURLAndTitle(preview_tab);
@@ -220,7 +220,7 @@ void PrintPreviewTabController::OnNavEntryCommitted(
     // User navigated to a preview tab using forward/back button.
     if (source_tab_is_preview_tab &&
         transition_type == content::PAGE_TRANSITION_FORWARD_BACK &&
-        nav_type == content::NAVIGATION_TYPE_EXISTING_PAGE) {
+        nav_type == NavigationType::EXISTING_PAGE) {
       return;
     }
   }
diff --git a/chrome/browser/printing/print_preview_tab_controller.h b/chrome/browser/printing/print_preview_tab_controller.h
index afd8b93..b954bfe 100644
--- a/chrome/browser/printing/print_preview_tab_controller.h
+++ b/chrome/browser/printing/print_preview_tab_controller.h
@@ -111,7 +111,7 @@ class PrintPreviewTabController
   NotificationRegistrar registrar_;
 
   // True if the controller is waiting for a new preview tab via
-  // content::NAVIGATION_TYPE_NEW_PAGE.
+  // NavigationType::NEW_PAGE.
   bool waiting_for_new_preview_page_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewTabController);
diff --git a/chrome/browser/printing/print_preview_tab_controller_unittest.cc b/chrome/browser/printing/print_preview_tab_controller_unittest.cc
index 8b418d4..2305a16 100644
--- a/chrome/browser/printing/print_preview_tab_controller_unittest.cc
+++ b/chrome/browser/printing/print_preview_tab_controller_unittest.cc
@@ -97,7 +97,7 @@ TEST_F(PrintPreviewTabControllerUnitTest, TitleAfterReload) {
   entry.reset(new NavigationEntry());
   entry->set_transition_type(content::PAGE_TRANSITION_RELOAD);
   content::LoadCommittedDetails details;
-  details.type = content::NAVIGATION_TYPE_SAME_PAGE;
+  details.type = NavigationType::SAME_PAGE;
   details.entry = entry.get();
   NotificationService::current()->Notify(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,