Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/browser/ui/toolbar/back_forward_menu_model.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/public/browser/favicon_status.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/registry_controlled_domain.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
@@ skipping 297 matching lines @@
         ++chapter_stops;
     } while (chapter_id != -1 && chapter_stops < kMaxChapterStops);
   }
 
   return chapter_stops;
 }
 
 int BackForwardMenuModel::GetIndexOfNextChapterStop(int start_from,
                                                     bool forward) const {
   WebContents* contents = GetWebContents();
-  NavigationController& controller = contents->GetController();
+  content::NavigationController& controller = contents->GetController();
 
   int max_count = controller.GetEntryCount();
   if (start_from < 0 || start_from >= max_count)
     return -1;  // Out of bounds.
 
   if (forward) {
     if (start_from < max_count - 1) {
       // We want to advance over the current chapter stop, so we add one.
       // We don't need to do this when direction is backwards.
       start_from++;
@@ skipping 89 matching lines @@
   // This menu item is a chapter stop located between the two separators.
   index = FindChapterStop(history_items,
                           model_type_ == FORWARD_MENU,
                           index - history_items - 1);
 
   return index;
 }
 
 NavigationEntry* BackForwardMenuModel::GetNavigationEntry(int index) const {
   int controller_index = MenuIndexToNavEntryIndex(index);
-  NavigationController& controller = GetWebContents()->GetController();
+  content::NavigationController& controller = GetWebContents()->GetController();
   if (controller_index >= 0 && controller_index < controller.GetEntryCount())
     return controller.GetEntryAtIndex(controller_index);
 
   NOTREACHED();
   return NULL;
 }
 
 std::string BackForwardMenuModel::BuildActionName(
     const std::string& action, int index) const {
   DCHECK(!action.empty());
   DCHECK(index >= -1);
   std::string metric_string;
   if (model_type_ == FORWARD_MENU)
     metric_string += "ForwardMenu_";
   else
     metric_string += "BackMenu_";
   metric_string += action;
   if (index != -1) {
     // +1 is for historical reasons (indices used to start at 1).
     metric_string += base::IntToString(index + 1);
   }
   return metric_string;
 }