Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

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"
@@ skipping 11 matching lines @@
 #include "content/public/browser/user_metrics.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"
 #include "ui/gfx/codec/png_codec.h"
 
+using content::NavigationEntry;
 using content::UserMetricsAction;
 
 const int BackForwardMenuModel::kMaxHistoryItems = 12;
 const int BackForwardMenuModel::kMaxChapterStops = 5;
 static const int kMaxWidth = 700;
 
 BackForwardMenuModel::BackForwardMenuModel(Browser* browser,
                                            ModelType model_type)
     : browser_(browser),
       test_tab_contents_(NULL),
@@ skipping 41 matching lines @@
   // Return label "Show Full History" for the last item of the menu.
   if (index == GetItemCount() - 1)
     return l10n_util::GetStringUTF16(IDS_SHOWFULLHISTORY_LINK);
 
   // Return an empty string for a separator.
   if (IsSeparator(index))
     return string16();
 
   // Return the entry title, escaping any '&' characters and eliding it if it's
   // super long.
-  content::NavigationEntry* entry = GetNavigationEntry(index);
+  NavigationEntry* entry = GetNavigationEntry(index);
   Profile* profile =
       Profile::FromBrowserContext(GetTabContents()->GetBrowserContext());
   string16 menu_text(entry->GetTitleForDisplay(
       profile->GetPrefs()->GetString(prefs::kAcceptLanguages)));
   menu_text =
       ui::ElideText(menu_text, gfx::Font(), kMaxWidth, ui::ELIDE_AT_END);
 
 #if !defined(OS_MACOSX)
   for (size_t i = menu_text.find('&'); i != string16::npos;
        i = menu_text.find('&', i + 2)) {
@@ skipping 24 matching lines @@
 }
 
 bool BackForwardMenuModel::GetIconAt(int index, SkBitmap* icon) {
   if (!ItemHasIcon(index))
     return false;
 
   if (index == GetItemCount() - 1) {
     *icon = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_HISTORY_FAVICON);
   } else {
-    content::NavigationEntry* entry = GetNavigationEntry(index);
+    NavigationEntry* entry = GetNavigationEntry(index);
     *icon = entry->GetFavicon().bitmap;
     if (!entry->GetFavicon().valid && menu_model_delegate()) {
       FetchFavicon(entry);
     }
   }
 
   return true;
 }
 
 ui::ButtonMenuItemModel* BackForwardMenuModel::GetButtonMenuItemAt(
@@ skipping 67 matching lines @@
 
   // Look to see if we have reached the separator for the history items.
   return index == history_items;
 }
 
 void BackForwardMenuModel::SetMenuModelDelegate(
       ui::MenuModelDelegate* menu_model_delegate) {
   menu_model_delegate_ = menu_model_delegate;
 }
 
-void BackForwardMenuModel::FetchFavicon(content::NavigationEntry* entry) {
+void BackForwardMenuModel::FetchFavicon(NavigationEntry* entry) {
   // If the favicon has already been requested for this menu, don't do
   // anything.
   if (requested_favicons_.find(entry->GetUniqueID()) !=
       requested_favicons_.end()) {
     return;
   }
   requested_favicons_.insert(entry->GetUniqueID());
   FaviconService* favicon_service =
       browser_->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
   if (!favicon_service)
     return;
   FaviconService::Handle handle = favicon_service->GetFaviconForURL(
       entry->GetURL(), history::FAVICON, &load_consumer_,
       base::Bind(&BackForwardMenuModel::OnFavIconDataAvailable,
                  base::Unretained(this)));
   load_consumer_.SetClientData(favicon_service, handle, entry->GetUniqueID());
 }
 
 void BackForwardMenuModel::OnFavIconDataAvailable(
     FaviconService::Handle handle,
     history::FaviconData favicon) {
   if (favicon.is_valid()) {
     int unique_id = load_consumer_.GetClientDataForCurrentRequest();
     // Find the current model_index for the unique_id.
-    content::NavigationEntry* entry = NULL;
+    NavigationEntry* entry = NULL;
     int model_index = -1;
     for (int i = 0; i < GetItemCount() - 1; i++) {
       if (IsSeparator(i))
         continue;
       if (GetNavigationEntry(i)->GetUniqueID() == unique_id) {
         model_index = i;
         entry = GetNavigationEntry(i);
         break;
       }
     }
@@ skipping 79 matching lines @@
   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++;
     } else {
       return -1;
     }
   }
 
-  content::NavigationEntry* start_entry =
-      controller.GetEntryAtIndex(start_from);
+  NavigationEntry* start_entry = controller.GetEntryAtIndex(start_from);
   const GURL& url = start_entry->GetURL();
 
   if (!forward) {
     // When going backwards we return the first entry we find that has a
     // different domain.
     for (int i = start_from - 1; i >= 0; --i) {
       if (!net::RegistryControlledDomainService::SameDomainOrHost(url,
               controller.GetEntryAtIndex(i)->GetURL()))
         return i;
     }
@@ skipping 70 matching lines @@
     return -1;  // This is beyond the last chapter stop so we abort.
 
   // 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;
 }
 
-content::NavigationEntry* BackForwardMenuModel::GetNavigationEntry(
-    int index) const {
+NavigationEntry* BackForwardMenuModel::GetNavigationEntry(int index) const {
   int controller_index = MenuIndexToNavEntryIndex(index);
   NavigationController& controller = GetTabContents()->GetController();
   if (controller_index >= 0 && controller_index < controller.entry_count())
     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;
 }