Move ExtensionWindowController and related into extensions namespace

chrome/browser/extensions/extension_function.cc

 // Copyright (c) 2012 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_function.h"
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_window_controller.h"
-#include "chrome/browser/extensions/extension_window_list.h"
+#include "chrome/browser/extensions/window_controller.h"
+#include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/result_codes.h"
@@ skipping 158 matching lines @@
 void UIThreadExtensionFunction::SetRenderViewHost(
     RenderViewHost* render_view_host) {
   render_view_host_ = render_view_host;
   tracker_.reset(render_view_host ?
       new RenderViewHostTracker(this, render_view_host) : NULL);
 }
 
 // TODO(stevenjb): Replace this with GetExtensionWindowController().
 Browser* UIThreadExtensionFunction::GetCurrentBrowser() {
   // If the delegate has an associated browser, return it.
-  ExtensionWindowController* window_controller =
+  extensions::WindowController* window_controller =
       dispatcher()->delegate()->GetExtensionWindowController();
   if (window_controller) {
     Browser* browser = window_controller->GetBrowser();
     if (browser)
       return browser;
   }
 
   // Otherwise, try to default to a reasonable browser. If |include_incognito_|
   // is true, we will also search browsers in the incognito version of this
   // profile. Note that the profile may already be incognito, in which case
   // we will search the incognito version only, regardless of the value of
   // |include_incognito|.
   Profile* profile = Profile::FromBrowserContext(
       render_view_host_->GetProcess()->GetBrowserContext());
   Browser* browser = browser::FindAnyBrowser(profile, include_incognito_);
 
   // NOTE(rafaelw): This can return NULL in some circumstances. In particular,
   // a background_page onload chrome.tabs api call can make it into here
   // before the browser is sufficiently initialized to return here.
   // A similar situation may arise during shutdown.
   // TODO(rafaelw): Delay creation of background_page until the browser
   // is available. http://code.google.com/p/chromium/issues/detail?id=13284
   return browser;
 }
 
-ExtensionWindowController*
+extensions::WindowController*
 UIThreadExtensionFunction::GetExtensionWindowController() {
   // If the delegate has an associated window controller, return it.
-  ExtensionWindowController* window_controller =
+  extensions::WindowController* window_controller =
       dispatcher()->delegate()->GetExtensionWindowController();
   if (window_controller)
     return window_controller;
 
-  return ExtensionWindowList::GetInstance()->CurrentWindowForFunction(this);
+  return extensions::WindowControllerList::GetInstance()->
+      CurrentWindowForFunction(this);
 }
 
 bool UIThreadExtensionFunction::CanOperateOnWindow(
-    const ExtensionWindowController* window_controller) const {
+    const extensions::WindowController* window_controller) const {
   const extensions::Extension* extension = GetExtension();
   // |extension| is NULL for unit tests only.
   if (extension != NULL && !window_controller->IsVisibleToExtension(extension))
     return false;
 
   if (profile() == window_controller->profile())
     return true;
 
   if (!include_incognito())
     return false;
@@ skipping 58 matching lines @@
 
 SyncIOThreadExtensionFunction::SyncIOThreadExtensionFunction() {
 }
 
 SyncIOThreadExtensionFunction::~SyncIOThreadExtensionFunction() {
 }
 
 void SyncIOThreadExtensionFunction::Run() {
   SendResponse(RunImpl());
 }