Remove chrome dependencies from app_window_api.cc

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/browser/devtools/devtools_window.h"
-#include "chrome/common/chrome_switches.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/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"
@@ skipping 32 matching lines @@
 const char kAlphaEnabledNeedsFrameNone[] =
     "The alphaEnabled option can only be used with \"frame: 'none'\".";
 }  // namespace app_window_constants
 
 const char kNoneFrameOption[] = "none";
   // TODO(benwells): Remove HTML titlebar injection.
 const char kHtmlFrameOption[] = "experimental-html";
 
 namespace {
 
-// Opens an inspector window and delays the response to the
-// AppWindowCreateFunction until the DevToolsWindow has finished loading, and is
-// ready to stop on breakpoints in the callback.
-class DevToolsRestorer : public base::RefCounted<DevToolsRestorer> {
- public:
-  DevToolsRestorer(AppWindowCreateFunction* delayed_create_function,
-                   content::WebContents* web_contents)
-      : delayed_create_function_(delayed_create_function) {
-    AddRef();  // Balanced in LoadCompleted.
-    DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindow(
-        web_contents,
-        DevToolsToggleAction::ShowConsole());
-    devtools_window->SetLoadCompletedCallback(
-        base::Bind(&DevToolsRestorer::LoadCompleted, this));
-  }
-
- private:
-  friend class base::RefCounted<DevToolsRestorer>;
-  ~DevToolsRestorer() {}
-
-  void LoadCompleted() {
-    delayed_create_function_->SendDelayedResponse();
-    Release();
-  }
-
-  scoped_refptr<AppWindowCreateFunction> delayed_create_function_;
-};
-
 // If the same property is specified for the inner and outer bounds, raise an
 // error.
 bool CheckBoundsConflict(const scoped_ptr<int>& inner_property,
                          const scoped_ptr<int>& outer_property,
                          const std::string& property_name,
                          std::string* error) {
   if (inner_property.get() && outer_property.get()) {
     std::vector<std::string> subst;
     subst.push_back(property_name);
     *error = ReplaceStringPlaceholders(
@@ skipping 28 matching lines @@
     create_spec->maximum_size.set_width(*input_spec->max_width);
   if (input_spec->max_height.get())
     create_spec->maximum_size.set_height(*input_spec->max_height);
 }
 
 }  // namespace
 
 AppWindowCreateFunction::AppWindowCreateFunction()
     : inject_html_titlebar_(false) {}
 
-void AppWindowCreateFunction::SendDelayedResponse() {
-  SendResponse(true);
-}
-
 bool AppWindowCreateFunction::RunAsync() {
   // Don't create app window if the system is shutting down.
   if (extensions::ExtensionsBrowserClient::Get()->IsShuttingDown())
     return false;
 
   scoped_ptr<Create::Params> params(Create::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   GURL url = extension()->GetResourceURL(params->url);
   // Allow absolute URLs for component apps, otherwise prepend the extension
@@ skipping 61 matching lines @@
           SetResult(result);
           SendResponse(true);
           return true;
         }
       }
     }
 
     if (!GetBoundsSpec(*options, &create_params, &error_))
       return false;
 
-    if (GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV ||
+    if (!apps::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 (GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV &&
+      if (apps::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 69 matching lines @@
   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())
           ->HadDevToolsAttached(created_view)) {
-    new DevToolsRestorer(this, app_window->web_contents());
+    apps::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(
@@ skipping 171 matching lines @@
 
   if (options.frame->as_frame_options->inactive_color.get()) {
     error_ = app_window_constants::kInactiveColorWithoutColor;
     return false;
   }
 
   return true;
 }
 
 }  // namespace extensions