Remove chrome.windows.* support for platform apps.

chrome/browser/ui/extensions/shell_window.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/extensions/shell_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
-#include "chrome/browser/extensions/extension_window_controller.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/intents/web_intents_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/view_type_utils.h"
@@ skipping 13 matching lines @@
 #include "content/public/common/renderer_preferences.h"
 
 using content::SiteInstance;
 using content::WebContents;
 
 namespace {
 static const int kDefaultWidth = 512;
 static const int kDefaultHeight = 384;
 }  // namespace
 
-namespace internal {
-
-class ShellWindowController : public ExtensionWindowController {
- public:
-  ShellWindowController(ShellWindow* shell_window, Profile* profile);
-
-  // Overriden from ExtensionWindowController
-  virtual int GetWindowId() const OVERRIDE;
-  virtual std::string GetWindowTypeText() 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:
-  ShellWindow* shell_window_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellWindowController);
-};
-
-ShellWindowController::ShellWindowController(
-    ShellWindow* shell_window,
-    Profile* profile)
-    : ExtensionWindowController(shell_window, profile),
-      shell_window_(shell_window) {
-}
-
-int ShellWindowController::GetWindowId() const {
-  return static_cast<int>(shell_window_->session_id().id());
-}
-
-std::string ShellWindowController::GetWindowTypeText() const {
-  return extension_tabs_module_constants::kWindowTypeValueShell;
-}
-
-base::DictionaryValue* ShellWindowController::CreateWindowValueWithTabs()
-    const {
-  return CreateWindowValue();
-}
-
-bool ShellWindowController::CanClose(Reason* reason) const {
-  return true;
-}
-
-void ShellWindowController::SetFullscreenMode(bool is_fullscreen,
-                                              const GURL& extension_url) const {
-  // TODO(mihaip): implement
-}
-
-bool ShellWindowController::IsVisibleToExtension(
-    const extensions::Extension* extension) const {
-  return shell_window_->extension() == extension;
-}
-
-}  // namespace internal
-
 ShellWindow::CreateParams::CreateParams()
   : frame(ShellWindow::CreateParams::FRAME_CUSTOM),
     bounds(10, 10, kDefaultWidth, kDefaultHeight) {
 }
 
 ShellWindow* ShellWindow::Create(Profile* profile,
                                  const extensions::Extension* extension,
                                  const GURL& url,
                                  const ShellWindow::CreateParams params) {
   // This object will delete itself when the window is closed.
@@ skipping 25 matching lines @@
                  content::Source<Profile>(profile_));
   // Close when the browser is exiting.
   // TODO(mihaip): we probably don't want this in the long run (when platform
   // apps are no longer tied to the browser process).
   registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
 
   // Prevent the browser process from shutting down while this window is open.
   browser::StartKeepAlive();
 
-  // Make this window available to the extension API.
-  extension_window_controller_.reset(
-      new internal::ShellWindowController(this, profile_));
-
   ShellWindowRegistry::Get(profile_)->AddShellWindow(this);
 }
 
 ShellWindow::~ShellWindow() {
   // Unregister now to prevent getting NOTIFICATION_APP_TERMINATING if we're the
   // last window open.
   registrar_.RemoveAll();
 
   ShellWindowRegistry::Get(profile_)->RemoveShellWindow(this);
 
@@ skipping 45 matching lines @@
   FileSelectHelper::RunFileChooser(tab, params);
 }
 
 bool ShellWindow::IsPopupOrPanel(const WebContents* source) const {
   DCHECK(source == web_contents_);
   return true;
 }
 
 void ShellWindow::MoveContents(WebContents* source, const gfx::Rect& pos) {
   DCHECK(source == web_contents_);
-  extension_window_controller_->window()->SetBounds(pos);
+  SetBounds(pos);
 }
 
 void ShellWindow::NavigationStateChanged(
     const content::WebContents* source, unsigned changed_flags) {
   DCHECK(source == web_contents_);
   if (changed_flags & content::INVALIDATE_TYPE_TITLE)
     UpdateWindowTitle();
 }
 
 void ShellWindow::Observe(int type,
@@ skipping 10 matching lines @@
     }
     case content::NOTIFICATION_APP_TERMINATING:
       Close();
       break;
     default:
       NOTREACHED() << "Received unexpected notification";
   }
 }
 
 ExtensionWindowController* ShellWindow::GetExtensionWindowController() const {
-  return extension_window_controller_.get();
+  return NULL;
 }
 
 void ShellWindow::OnRequest(const ExtensionHostMsg_Request_Params& params) {
   extension_function_dispatcher_.Dispatch(params,
                                           web_contents_->GetRenderViewHost());
 }