Move app.window API implementation to extensions

extensions/browser/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 "extensions/browser/api/app_window/app_window_api.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/common/extensions/api/app_window.h"
 #include "content/public/browser/notification_registrar.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/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_contents.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/apps_client.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/image_util.h"
+#include "extensions/common/api/app_window.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 
-namespace app_window = extensions::api::app_window;
+namespace app_window = extensions::core_api::app_window;
 namespace Create = app_window::Create;
 
 namespace extensions {
 
 namespace app_window_constants {
 const char kInvalidWindowId[] =
     "The window id can not be more than 256 characters long.";
 const char kInvalidColorSpecification[] =
     "The color specification could not be parsed.";
 const char kColorWithFrameNone[] = "Windows with no frame cannot have a color.";
@@ skipping 31 matching lines @@
     *error = ReplaceStringPlaceholders(
         app_window_constants::kConflictingBoundsOptions, subst, NULL);
     return false;
   }
 
   return true;
 }
 
 // Copy over the bounds specification properties from the API to the
 // AppWindow::CreateParams.
-void CopyBoundsSpec(
-    const extensions::api::app_window::BoundsSpecification* input_spec,
-    AppWindow::BoundsSpecification* create_spec) {
+void CopyBoundsSpec(const app_window::BoundsSpecification* input_spec,
+                    AppWindow::BoundsSpecification* create_spec) {
   if (!input_spec)
     return;
 
   if (input_spec->left.get())
     create_spec->bounds.set_x(*input_spec->left);
   if (input_spec->top.get())
     create_spec->bounds.set_y(*input_spec->top);
   if (input_spec->width.get())
     create_spec->bounds.set_width(*input_spec->width);
   if (input_spec->height.get())
@@ skipping 89 matching lines @@
           return true;
         }
       }
     }
 
     if (!GetBoundsSpec(*options, &create_params, &error_))
       return false;
 
     if (!AppsClient::Get()->IsCurrentChannelOlderThanDev() ||
         extension()->location() == extensions::Manifest::COMPONENT) {
-      if (options->type == extensions::api::app_window::WINDOW_TYPE_PANEL) {
+      if (options->type == app_window::WINDOW_TYPE_PANEL) {
         create_params.window_type = AppWindow::WINDOW_TYPE_PANEL;
       }
     }
 
     if (!GetFrameOptions(*options, &create_params))
       return false;
 
     if (options->alpha_enabled.get()) {
       const char* whitelist[] = {
         "0F42756099D914A026DADFA182871C015735DD95",  // http://crbug.com/323773
@@ skipping 41 matching lines @@
           !extension()->permissions_data()->HasAPIPermission(
               APIPermission::kAlwaysOnTopWindows)) {
         error_ = app_window_constants::kAlwaysOnTopPermission;
         return false;
       }
     }
 
     if (options->focused.get())
       create_params.focused = *options->focused.get();
 
-    if (options->type != extensions::api::app_window::WINDOW_TYPE_PANEL) {
+    if (options->type != app_window::WINDOW_TYPE_PANEL) {
       switch (options->state) {
-        case extensions::api::app_window::STATE_NONE:
-        case extensions::api::app_window::STATE_NORMAL:
+        case app_window::STATE_NONE:
+        case app_window::STATE_NORMAL:
           break;
-        case extensions::api::app_window::STATE_FULLSCREEN:
+        case app_window::STATE_FULLSCREEN:
           create_params.state = ui::SHOW_STATE_FULLSCREEN;
           break;
-        case extensions::api::app_window::STATE_MAXIMIZED:
+        case app_window::STATE_MAXIMIZED:
           create_params.state = ui::SHOW_STATE_MAXIMIZED;
           break;
-        case extensions::api::app_window::STATE_MINIMIZED:
+        case app_window::STATE_MINIMIZED:
           create_params.state = ui::SHOW_STATE_MINIMIZED;
           break;
       }
     }
   }
 
   create_params.creator_process_id =
       render_view_host_->GetProcess()->GetID();
 
   AppWindow* app_window =
@@ skipping 25 matching lines @@
     return true;
   }
 
   SendResponse(true);
   app_window->WindowEventsReady();
 
   return true;
 }
 
 bool AppWindowCreateFunction::GetBoundsSpec(
-    const extensions::api::app_window::CreateWindowOptions& options,
+    const app_window::CreateWindowOptions& options,
     AppWindow::CreateParams* params,
     std::string* error) {
   DCHECK(params);
   DCHECK(error);
 
   if (options.inner_bounds.get() || options.outer_bounds.get()) {
     // Parse the inner and outer bounds specifications. If developers use the
     // new API, the deprecated fields will be ignored - do not attempt to merge
     // them.
 
-    const extensions::api::app_window::BoundsSpecification* inner_bounds =
+    const app_window::BoundsSpecification* inner_bounds =
         options.inner_bounds.get();
-    const extensions::api::app_window::BoundsSpecification* outer_bounds =
+    const app_window::BoundsSpecification* outer_bounds =
         options.outer_bounds.get();
     if (inner_bounds && outer_bounds) {
       if (!CheckBoundsConflict(
                inner_bounds->left, outer_bounds->left, "left", error)) {
         return false;
       }
       if (!CheckBoundsConflict(
                inner_bounds->top, outer_bounds->top, "top", error)) {
         return false;
       }
@@ skipping 147 matching lines @@
 
   if (options.frame->as_frame_options->inactive_color.get()) {
     error_ = app_window_constants::kInactiveColorWithoutColor;
     return false;
   }
 
   return true;
 }
 
 }  // namespace extensions