Remove some chrome dependencies from extensions app_window API

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/apps_client.h"
 #include "apps/ui/native_app_window.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/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/devtools/devtools_window.h"
-#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
-#include "chrome/browser/extensions/window_controller.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "chrome/common/extensions/features/feature_channel.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/extensions_browser_client.h"
+#include "extensions/browser/image_util.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"
 
-#if defined(USE_ASH)
-#include "ash/shell.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
-#endif
-
 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.";
@@ skipping 129 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(GetProfile())
+        AppWindow* window = apps::AppWindowRegistry::Get(browser_context())
                                 ->GetAppWindowForAppAndKey(
-                                      extension_id(), create_params.window_key);
+                                    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();
           }
 
           if (options->focused.get() && !*options->focused.get())
@@ skipping 63 matching lines @@
           break;
       }
     }
   }
 
   UpdateFrameOptionsForChannel(&create_params);
 
   create_params.creator_process_id =
       render_view_host_->GetProcess()->GetID();
 
-  AppWindow* app_window =
-      apps::AppsClient::Get()->CreateAppWindow(GetProfile(), GetExtension());
+  AppWindow* app_window = apps::AppsClient::Get()->CreateAppWindow(
+      browser_context(), GetExtension());
   app_window->Init(
       url, new apps::AppWindowContentsImpl(app_window), create_params);
 
-  if (chrome::IsRunningInForcedAppMode())
+  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(GetProfile())
+  if (apps::AppWindowRegistry::Get(browser_context())
           ->HadDevToolsAttached(created_view)) {
     new DevToolsRestorer(this, created_view);
     return true;
   }
 
   SendResponse(true);
   return true;
 }
 
 bool AppWindowCreateFunction::GetBoundsSpec(
@@ skipping 149 matching lines @@
   if (options.frame->as_frame_options->type)
     create_params->frame =
         GetFrameFromString(*options.frame->as_frame_options->type);
 
   if (options.frame->as_frame_options->color.get()) {
     if (create_params->frame != AppWindow::FRAME_CHROME) {
       error_ = app_window_constants::kColorWithFrameNone;
       return false;
     }
 
-    if (ExtensionActionFunction::ParseCSSColorString(
-            *options.frame->as_frame_options->color,
-            &create_params->frame_color)) {
+    if (image_util::ParseCSSColorString(*options.frame->as_frame_options->color,
+                                        &create_params->frame_color)) {
       create_params->has_frame_color = true;
       return true;
     }
 
     error_ = app_window_constants::kInvalidColorSpecification;
     return false;
   }
 
   return true;
 }
 
 void AppWindowCreateFunction::UpdateFrameOptionsForChannel(
     apps::AppWindow::CreateParams* create_params) {
 #if defined(OS_WIN)
   if (create_params->frame == AppWindow::FRAME_CHROME &&
       GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV) {
     // If not on trunk or dev channel, always use the standard white frame.
     // TODO(benwells): Remove this code once we get agreement to use the new
     // native style frame.
     create_params->has_frame_color = true;
     create_params->frame_color = SK_ColorWHITE;
   }
 #endif
 }
 
 }  // namespace extensions