Move AppWindow to extensions

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 "apps/app_window.h"
 #include "apps/app_window_contents.h"
-#include "apps/app_window_registry.h"
-#include "apps/ui/apps_client.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_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/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"
 
-using apps::AppWindow;
-
 namespace app_window = extensions::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.";
@@ skipping 34 matching lines @@
     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,
-    apps::AppWindow::BoundsSpecification* create_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 52 matching lines @@
       create_params.window_key = *options->id;
 
       if (options->singleton && *options->singleton == false) {
         WriteToConsole(
           content::CONSOLE_MESSAGE_LEVEL_WARNING,
           "The 'singleton' option in chrome.apps.window.create() is deprecated!"
           " Change your code to no longer rely on this.");
       }
 
       if (!options->singleton || *options->singleton) {
-        AppWindow* window = apps::AppWindowRegistry::Get(browser_context())
+        AppWindow* window = AppWindowRegistry::Get(browser_context())
                                 ->GetAppWindowForAppAndKey(
                                     extension_id(), create_params.window_key);
         if (window) {
           content::RenderViewHost* created_view =
               window->web_contents()->GetRenderViewHost();
           int view_id = MSG_ROUTING_NONE;
           if (render_view_host_->GetProcess()->GetID() ==
               created_view->GetProcess()->GetID()) {
             view_id = created_view->GetRoutingID();
           }
@@ skipping 14 matching lines @@
           SetResult(result);
           SendResponse(true);
           return true;
         }
       }
     }
 
     if (!GetBoundsSpec(*options, &create_params, &error_))
       return false;
 
-    if (!apps::AppsClient::Get()->IsCurrentChannelOlderThanDev() ||
+    if (!AppsClient::Get()->IsCurrentChannelOlderThanDev() ||
         extension()->location() == extensions::Manifest::COMPONENT) {
       if (options->type == extensions::api::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
         "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7",
         "E7E2461CE072DF036CF9592740196159E2D7C089",  // http://crbug.com/356200
         "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3",
         "312745D9BF916161191143F6490085EEA0434997",
         "53041A2FA309EECED01FFC751E7399186E860B2C"
       };
-      if (apps::AppsClient::Get()->IsCurrentChannelOlderThanDev() &&
+      if (AppsClient::Get()->IsCurrentChannelOlderThanDev() &&
           !extensions::SimpleFeature::IsIdInList(
               extension_id(),
               std::set<std::string>(whitelist,
                                     whitelist + arraysize(whitelist)))) {
         error_ = app_window_constants::kAlphaEnabledWrongChannel;
         return false;
       }
       if (!extension()->permissions_data()->HasAPIPermission(
               APIPermission::kAlphaEnabled)) {
         error_ = app_window_constants::kAlphaEnabledMissingPermission;
@@ skipping 46 matching lines @@
           create_params.state = ui::SHOW_STATE_MINIMIZED;
           break;
       }
     }
   }
 
   create_params.creator_process_id =
       render_view_host_->GetProcess()->GetID();
 
   AppWindow* app_window =
-      apps::AppsClient::Get()->CreateAppWindow(browser_context(), extension());
+      AppsClient::Get()->CreateAppWindow(browser_context(), extension());
   app_window->Init(
       url, new apps::AppWindowContentsImpl(app_window), create_params);
 
   if (ExtensionsBrowserClient::Get()->IsRunningInForcedAppMode())
     app_window->ForcedFullscreen();
 
   content::RenderViewHost* created_view =
       app_window->web_contents()->GetRenderViewHost();
   int view_id = MSG_ROUTING_NONE;
   if (create_params.creator_process_id == created_view->GetProcess()->GetID())
     view_id = created_view->GetRoutingID();
 
   base::DictionaryValue* result = new base::DictionaryValue;
   result->Set("viewId", new base::FundamentalValue(view_id));
   result->Set("injectTitlebar",
       new base::FundamentalValue(inject_html_titlebar_));
   result->Set("id", new base::StringValue(app_window->window_key()));
   app_window->GetSerializedState(result);
   SetResult(result);
 
-  if (apps::AppWindowRegistry::Get(browser_context())
+  if (AppWindowRegistry::Get(browser_context())
           ->HadDevToolsAttached(created_view)) {
-    apps::AppsClient::Get()->OpenDevToolsWindow(
+    AppsClient::Get()->OpenDevToolsWindow(
         app_window->web_contents(),
         base::Bind(&AppWindowCreateFunction::SendResponse, this, true));
     return true;
   }
 
   SendResponse(true);
   app_window->WindowEventsReady();
 
   return true;
 }
 
 bool AppWindowCreateFunction::GetBoundsSpec(
     const extensions::api::app_window::CreateWindowOptions& options,
-    apps::AppWindow::CreateParams* params,
+    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 =
@@ skipping 159 matching lines @@
 
   if (options.frame->as_frame_options->inactive_color.get()) {
     error_ = app_window_constants::kInactiveColorWithoutColor;
     return false;
   }
 
   return true;
 }
 
 }  // namespace extensions