Move context-sensitive app.window.* functions to app.window.current().*

chrome/browser/extensions/api/app_window/app_window_api.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/api/app_window/app_window_api.h"
 
 #include "base/time.h"
 #include "base/values.h"
-#include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/common/extensions/api/app_window.h"
-#include "chrome/common/extensions/extension_error_utils.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
 namespace app_window = extensions::api::app_window;
 namespace Create = app_window::Create;
 
 namespace extensions {
 
-namespace app_window_constants {
-const char kNoAssociatedShellWindow[] =
-    "The context from which the function was called did not have an "
-    "associated shell window.";
-};
-
-bool AppWindowExtensionFunction::RunImpl() {
-  ShellWindowRegistry* registry = ShellWindowRegistry::Get(profile());
-  CHECK(registry);
-  content::RenderViewHost* rvh = render_view_host();
-  if (!rvh)
-    // No need to set an error, since we won't return to the caller anyway if
-    // there's no RVH.
-    return false;
-  ShellWindow* window = registry->GetShellWindowForRenderViewHost(rvh);
-  if (!window) {
-    error_ = app_window_constants::kNoAssociatedShellWindow;
-    return false;
-  }
-  return RunWithWindow(window);
-}
-
 const char kNoneFrameOption[] = "none";
 
 bool AppWindowCreateFunction::RunImpl() {
   scoped_ptr<Create::Params> params(Create::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   GURL url = GetExtension()->GetResourceURL(params->url);
 
   // TODO(jeremya): figure out a way to pass the opening WebContents through to
   // ShellWindow::Create so we can set the opener at create time rather than
@@ skipping 49 matching lines @@
       ShellWindow::Create(profile(), GetExtension(), url, create_params);
   shell_window->GetBaseWindow()->Show();
 
   content::WebContents* created_contents = shell_window->web_contents();
   int view_id = created_contents->GetRenderViewHost()->GetRoutingID();
 
   SetResult(base::Value::CreateIntegerValue(view_id));
   return true;
 }
 
-bool AppWindowFocusFunction::RunWithWindow(ShellWindow* window) {
-  window->GetBaseWindow()->Activate();
-  return true;
-}
-
-bool AppWindowMaximizeFunction::RunWithWindow(ShellWindow* window) {
-  window->GetBaseWindow()->Maximize();
-  return true;
-}
-
-bool AppWindowMinimizeFunction::RunWithWindow(ShellWindow* window) {
-  window->GetBaseWindow()->Minimize();
-  return true;
-}
-
-bool AppWindowRestoreFunction::RunWithWindow(ShellWindow* window) {
-  window->GetBaseWindow()->Restore();
-  return true;
-}
-
 }  // namespace extensions