Remove chrome dependencies from app_window_api.cc

Add OpenDevToolsWindow() and IsCurrentChannelOlderThanDev() to AppsClient.

BUG=387288

Review URL: https://codereview.chromium.org/494483006

Cr-Commit-Position: refs/heads/master@{#291843}

apps/ui/apps_client.h

@@ -8,9 +8,11 @@
 #include <vector>
 
 #include "apps/app_window.h"
+#include "base/callback_forward.h"
 
 namespace content {
 class BrowserContext;
+class WebContents;
 }
 
 namespace extensions {
@@ -43,6 +45,13 @@ class AppsClient {
   virtual void IncrementKeepAliveCount() = 0;
   virtual void DecrementKeepAliveCount() = 0;
 
+  // Opens DevTools window and runs the callback.
+  virtual void OpenDevToolsWindow(content::WebContents* web_contents,
+                                  const base::Closure& callback) = 0;
+
+  // Returns true if the current channel is older than dev.
+  virtual bool IsCurrentChannelOlderThanDev() = 0;
+
   // Return the apps client.
   static AppsClient* Get();
 

chrome/browser/extensions/api/app_window/app_window_api.cc

@@ -13,10 +13,7 @@
 #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"
@@ -69,34 +66,6 @@ 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,
@@ -145,10 +114,6 @@ void CopyBoundsSpec(
 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())
@@ -230,7 +195,7 @@ bool AppWindowCreateFunction::RunAsync() {
     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;
@@ -249,7 +214,7 @@ bool AppWindowCreateFunction::RunAsync() {
         "312745D9BF916161191143F6490085EEA0434997",
         "53041A2FA309EECED01FFC751E7399186E860B2C"
       };
-      if (GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV &&
+      if (apps::AppsClient::Get()->IsCurrentChannelOlderThanDev() &&
           !extensions::SimpleFeature::IsIdInList(
               extension_id(),
               std::set<std::string>(whitelist,
@@ -339,7 +304,9 @@ bool AppWindowCreateFunction::RunAsync() {
 
   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;
   }
 

chrome/browser/extensions/api/app_window/app_window_api.h

@@ -21,8 +21,6 @@ class AppWindowCreateFunction : public AsyncExtensionFunction {
   AppWindowCreateFunction();
   DECLARE_EXTENSION_FUNCTION("app.window.create", APP_WINDOW_CREATE)
 
-  void SendDelayedResponse();
-
  protected:
   virtual ~AppWindowCreateFunction() {}
   virtual bool RunAsync() OVERRIDE;

chrome/browser/ui/apps/chrome_apps_client.cc

@@ -7,7 +7,9 @@
 #include "apps/app_window.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/common/extensions/features/feature_channel.h"
 #include "extensions/common/extension.h"
 
 // TODO(jamescook): We probably shouldn't compile this class at all on Android.
@@ -68,3 +70,14 @@ void ChromeAppsClient::DecrementKeepAliveCount() {
   chrome::DecrementKeepAliveCount();
 #endif
 }
+
+void ChromeAppsClient::OpenDevToolsWindow(content::WebContents* web_contents,
+                                          const base::Closure& callback) {
+  DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindow(
+      web_contents, DevToolsToggleAction::ShowConsole());
+  devtools_window->SetLoadCompletedCallback(callback);
+}
+
+bool ChromeAppsClient::IsCurrentChannelOlderThanDev() {
+  return extensions::GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV;
+}

chrome/browser/ui/apps/chrome_apps_client.h

@@ -35,6 +35,9 @@ class ChromeAppsClient : public apps::AppsClient {
       const apps::AppWindow::CreateParams& params) OVERRIDE;
   virtual void IncrementKeepAliveCount() OVERRIDE;
   virtual void DecrementKeepAliveCount() OVERRIDE;
+  virtual void OpenDevToolsWindow(content::WebContents* web_contents,
+                                  const base::Closure& callback) OVERRIDE;
+  virtual bool IsCurrentChannelOlderThanDev() OVERRIDE;
 
   // Implemented in platform specific code.
   static extensions::NativeAppWindow* CreateNativeAppWindowImpl(