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

chrome/browser/extensions/extension_page_actions_module.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 "chrome/browser/extensions/extension_page_actions_module.h"
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_page_actions_module_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/navigation_entry.h"
 
+using content::NavigationEntry;
+
 namespace keys = extension_page_actions_module_constants;
 
 namespace {
 // Errors.
 const char kNoTabError[] = "No tab with id: *.";
 const char kNoPageActionError[] =
     "This extension has no page action specified.";
 const char kUrlNotActiveError[] = "This url is no longer active: *.";
 const char kIconIndexOutOfBounds[] = "Page action icon index out of bounds.";
 const char kNoIconSpecified[] = "Page action has no icons to show.";
@@ skipping 39 matching lines @@
   TabContentsWrapper* contents = NULL;
   bool result = ExtensionTabUtil::GetTabById(
       tab_id, profile(), include_incognito(), NULL, NULL, &contents, NULL);
   if (!result || !contents) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         kNoTabError, base::IntToString(tab_id));
     return false;
   }
 
   // Make sure the URL hasn't changed.
-  content::NavigationEntry* entry =
+  NavigationEntry* entry =
       contents->tab_contents()->GetController().GetActiveEntry();
   if (!entry || url != entry->GetURL().spec()) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(kUrlNotActiveError, url);
     return false;
   }
 
   // Set visibility and broadcast notifications that the UI should be updated.
   page_action->SetIsVisible(tab_id, enable);
   page_action->SetTitle(tab_id, title);
   page_action->SetIconIndex(tab_id, icon_id);
@@ skipping 190 matching lines @@
   if (!InitCommon(tab_id))
     return false;
 
   std::string text;
   EXTENSION_FUNCTION_VALIDATE(args->GetString("text", &text));
 
   page_action_->SetBadgeText(tab_id, text);
   contents_->extension_tab_helper()->PageActionStateChanged();
   return true;
 }