Move ExtensionWindowController and related into extensions namespace

chrome/browser/ui/views/ash/panel_view_aura.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/ui/views/ash/panel_view_aura.h"
 
 #include "ash/wm/panel_frame_view.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.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/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 25 matching lines @@
  public:
   PanelHost(PanelViewAura* panel_view, Profile* profile);
   virtual ~PanelHost();
 
   void Init(const GURL& url);
 
   content::WebContents* web_contents() const { return web_contents_.get(); }
   Profile* profile() const { return profile_; }
 
   // ExtensionFunctionDispatcher::Delegate overrides.
-  virtual ExtensionWindowController* GetExtensionWindowController()
+  virtual extensions::WindowController* GetExtensionWindowController()
       const OVERRIDE;
   virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
 
   // content::WebContentsDelegate implementation:
   virtual void CloseContents(content::WebContents* source) OVERRIDE;
   virtual void HandleMouseDown() OVERRIDE;
   virtual void UpdatePreferredSize(content::WebContents* source,
                                    const gfx::Size& pref_size) OVERRIDE;
   virtual void AddNewContents(content::WebContents* source,
                               content::WebContents* new_contents,
@@ skipping 37 matching lines @@
   web_contents_.reset(content::WebContents::Create(
       profile_, site_instance_.get(), MSG_ROUTING_NONE, NULL, NULL));
   chrome::SetViewType(web_contents_.get(), chrome::VIEW_TYPE_PANEL);
   web_contents_->SetDelegate(this);
   Observe(web_contents_.get());
 
   web_contents_->GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
 }
 
-ExtensionWindowController* PanelHost::GetExtensionWindowController() const {
+extensions::WindowController* PanelHost::GetExtensionWindowController() const {
   return panel_view_->extension_window_controller();
 }
 
 content::WebContents* PanelHost::GetAssociatedWebContents() const {
   return web_contents_.get();
 }
 
 void PanelHost::CloseContents(content::WebContents* source) {
   panel_view_->CloseView();
 }
@@ skipping 42 matching lines @@
 }
 
 void PanelHost::OnRequest(const ExtensionHostMsg_Request_Params& params) {
   extension_function_dispatcher_.Dispatch(params,
                                           web_contents_->GetRenderViewHost());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PanelExtensionWindowController
 
-class PanelExtensionWindowController : public ExtensionWindowController {
+class PanelExtensionWindowController : public extensions::WindowController {
  public:
   PanelExtensionWindowController(PanelViewAura* panel_view,
                                  PanelHost* panel_host);
 
-  // Overriden from ExtensionWindowController:
+  // Overriden from extensions::WindowController:
   virtual int GetWindowId() const OVERRIDE;
   virtual std::string GetWindowTypeText() const OVERRIDE;
   virtual base::DictionaryValue* CreateWindowValue() const OVERRIDE;
   virtual base::DictionaryValue* CreateWindowValueWithTabs() const OVERRIDE;
   virtual bool CanClose(Reason* reason) const OVERRIDE;
   virtual void SetFullscreenMode(bool is_fullscreen,
                                  const GURL& extension_url) const OVERRIDE;
   virtual bool IsVisibleToExtension(
       const extensions::Extension* extension) const OVERRIDE;
 
  private:
   PanelViewAura* panel_view_;
   PanelHost* panel_host_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelExtensionWindowController);
 };
 
 PanelExtensionWindowController::PanelExtensionWindowController(
     PanelViewAura* panel_view,
     PanelHost* panel_host)
-    : ExtensionWindowController(panel_view, panel_host->profile()),
+    : extensions::WindowController(panel_view, panel_host->profile()),
       panel_view_(panel_view),
       panel_host_(panel_host) {
 }
 
 int PanelExtensionWindowController::GetWindowId() const {
   return static_cast<int>(panel_view_->session_id().id());
 }
 
 std::string PanelExtensionWindowController::GetWindowTypeText() const {
   return keys::kWindowTypeValuePanel;
 }
 
 base::DictionaryValue*
 PanelExtensionWindowController::CreateWindowValue() const {
-  DictionaryValue* result = ExtensionWindowController::CreateWindowValue();
+  DictionaryValue* result = extensions::WindowController::CreateWindowValue();
   return result;
 }
 
 base::DictionaryValue*
 PanelExtensionWindowController::CreateWindowValueWithTabs() const {
   DictionaryValue* result = CreateWindowValue();
 
   // TODO(stevenjb): Implement tab interface for Aura panels.
   // Currently there is no mechanism to get a tab id without an associated
   // TabContents. We will need to either add a TabContents for
@@ skipping 213 matching lines @@
 }
 
 void PanelViewAura::FlashFrame(bool flash) {
   // TODO(stevenjb): Implement
   NOTIMPLEMENTED();
 }
 
 bool PanelViewAura::IsAlwaysOnTop() const {
   return true;
 }