DevTools: Replace .allow-devtools-edit file check with confirmation infobar.

chrome/browser/devtools/devtools_window.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/debugger/debugger_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/file_select_helper.h"
+#include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 21 matching lines @@
 #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/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/url_constants.h"
 #include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 
 typedef std::vector<DevToolsWindow*> DevToolsWindowList;
 namespace {
 base::LazyInstance<DevToolsWindowList>::Leaky
      g_instances = LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
 using base::Bind;
+using base::Callback;
 using content::DevToolsAgentHost;
 using content::DevToolsClientHost;
 using content::DevToolsManager;
 using content::FileChooserParams;
 using content::NativeWebKeyboardEvent;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::RenderViewHost;
 using content::WebContents;
@@ skipping 36 matching lines @@
     : WebContentsObserver(web_contents) {
   }
  private:
   // Overriden from contents::WebContentsObserver.
   virtual void AboutToNavigateRenderView(
       RenderViewHost* render_view_host) OVERRIDE {
     content::DevToolsClientHost::SetupDevToolsFrontendClient(render_view_host);
   }
 };
 
+typedef Callback<void()> InfoBarCallback;
+
+class DevToolsConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
+ public:
+  DevToolsConfirmInfoBarDelegate(
+      InfoBarService* infobar_service,
+      const InfoBarCallback& accept_callback,
+      const InfoBarCallback& cancel_callback,
+      string16 message)
+      : ConfirmInfoBarDelegate(infobar_service),
+        accept_callback_(accept_callback),
+        cancel_callback_(cancel_callback),
+        message_(message),
+        callback_sent(false) {
+  }
+
+  virtual string16 GetMessageText() const {
+    return message_;
+  }
+
+  virtual bool Accept() {
+    callback_sent = true;
+    accept_callback_.Run();
+    return true;
+  }
+
+  virtual bool Cancel() {
+    callback_sent = true;
+    cancel_callback_.Run();
+    return true;
+  }
+
+  string16 GetButtonLabel(InfoBarButton button) const {
+    return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
+        IDS_DEV_TOOLS_CONFIRM_ALLOW_BUTTON :
+        IDS_DEV_TOOLS_CONFIRM_DENY_BUTTON);
+  }
+
+ private:
+  virtual ~DevToolsConfirmInfoBarDelegate() {
+    if (!callback_sent) {
+      cancel_callback_.Run();
+    }
+  }
+
+  InfoBarCallback accept_callback_;
+  InfoBarCallback cancel_callback_;
+  string16 message_;
+  bool callback_sent;
+};
+
 // static
 std::string DevToolsWindow::GetDevToolsWindowPlacementPrefKey() {
   std::string wp_key;
   wp_key.append(prefs::kBrowserWindowPlacement);
   wp_key.append("_");
   wp_key.append(kDevToolsApp);
   return wp_key;
 }
 
 // static
@@ skipping 838 matching lines @@
 
 void DevToolsWindow::RequestFileSystems() {
   CHECK(web_contents_->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
   file_helper_->RequestFileSystems(
       Bind(&DevToolsWindow::FileSystemsLoaded, weak_factory_.GetWeakPtr()));
 }
 
 void DevToolsWindow::AddFileSystem() {
   CHECK(web_contents_->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
   file_helper_->AddFileSystem(
-      Bind(&DevToolsWindow::FileSystemAdded, weak_factory_.GetWeakPtr()));
+      Bind(&DevToolsWindow::FileSystemAdded, weak_factory_.GetWeakPtr()),
+      Bind(&DevToolsWindow::ShowDevToolsConfirmInfoBar,
+           weak_factory_.GetWeakPtr()));
 }
 
 void DevToolsWindow::RemoveFileSystem(const std::string& file_system_path) {
   CHECK(web_contents_->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
   file_helper_->RemoveFileSystem(file_system_path);
   StringValue file_system_path_value(file_system_path);
   CallClientFunction("InspectorFrontendAPI.fileSystemRemoved",
                      &file_system_path_value);
 }
 
@@ skipping 11 matching lines @@
     const std::vector<DevToolsFileHelper::FileSystem>& file_systems) {
   ListValue file_systems_value;
   for (size_t i = 0; i < file_systems.size(); ++i) {
     file_systems_value.Append(CreateFileSystemValue(file_systems[i]));
   }
   CallClientFunction("InspectorFrontendAPI.fileSystemsLoaded",
                      &file_systems_value);
 }
 
 void DevToolsWindow::FileSystemAdded(
-    std::string error_string,
     const DevToolsFileHelper::FileSystem& file_system) {
-  StringValue error_string_value(error_string);
+  StringValue error_string_value("");
   DictionaryValue* file_system_value = NULL;
   if (!file_system.file_system_path.empty())
     file_system_value = CreateFileSystemValue(file_system);
   CallClientFunction("InspectorFrontendAPI.fileSystemAdded",
                      &error_string_value,
                      file_system_value);
   if (file_system_value)
     delete file_system_value;
 }
 
+void DevToolsWindow::ShowDevToolsConfirmInfoBar(
+    const string16& message,
+    const InfoBarCallback& accept_callback,
+    const InfoBarCallback& cancel_callback) {
+  InfoBarService* infobar_service = IsDocked() ?
+      InfoBarService::FromWebContents(GetInspectedWebContents()) :
+      InfoBarService::FromWebContents(web_contents_);
+
+  if (infobar_service) {
+    infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+        new DevToolsConfirmInfoBarDelegate(
+            infobar_service,
+            accept_callback,
+            cancel_callback,
+            message)));
+  } else {
+    cancel_callback.Run();
+  }
+}
+
 content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {
   content::WebContents* inspected_web_contents = GetInspectedWebContents();
   if (inspected_web_contents && inspected_web_contents->GetDelegate()) {
     return inspected_web_contents->GetDelegate()->
         GetJavaScriptDialogManager();
   }
   return content::WebContentsDelegate::GetJavaScriptDialogManager();
 }
 
 void DevToolsWindow::RunFileChooser(WebContents* web_contents,
@@ skipping 62 matching lines @@
 DevToolsDockSide DevToolsWindow::SideFromString(
     const std::string& dock_side) {
   if (dock_side == kDockSideRight)
     return DEVTOOLS_DOCK_SIDE_RIGHT;
   if (dock_side == kDockSideBottom)
     return DEVTOOLS_DOCK_SIDE_BOTTOM;
   if (dock_side == kDockSideMinimized)
     return DEVTOOLS_DOCK_SIDE_MINIMIZED;
   return DEVTOOLS_DOCK_SIDE_UNDOCKED;
 }