Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

1 files changed, 12 insertions, 11 deletions

diff --git a/chrome/browser/debugger/devtools_manager.h b/chrome/browser/debugger/devtools_manager.h
index 20835af..1c60a4d 100644
--- a/chrome/browser/debugger/devtools_manager.h
+++ b/chrome/browser/debugger/devtools_manager.h
@@ -1,17 +1,18 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_H_
 #define CHROME_BROWSER_DEBUGGER_DEVTOOLS_MANAGER_H_
+#pragma once
 
 #include <map>
-#include <set>
 #include <string>
 
 #include "base/ref_counted.h"
 #include "chrome/browser/debugger/devtools_client_host.h"
 #include "chrome/browser/debugger/devtools_toggle_action.h"
+#include "chrome/common/devtools_messages.h"
 
 namespace IPC {
 class Message;
@@ -57,9 +58,9 @@ class DevToolsManager : public DevToolsClientHost::CloseListener,
   void OpenDevToolsWindow(RenderViewHost* inspected_rvh);
   void ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
                             DevToolsToggleAction action);
-  void RuntimeFeatureStateChanged(RenderViewHost* inspected_rvh,
-                                  const std::string& feature,
-                                  bool enabled);
+  void RuntimePropertyChanged(RenderViewHost* inspected_rvh,
+                              const std::string& name,
+                              const std::string& value);
 
   // Starts element inspection in the devtools client.
   // Creates one by means of OpenDevToolsWindow if no client
@@ -82,7 +83,6 @@ class DevToolsManager : public DevToolsClientHost::CloseListener,
 
  private:
   friend class base::RefCounted<DevToolsManager>;
-  typedef std::set<std::string> RuntimeFeatures;
 
   virtual ~DevToolsManager();
 
@@ -111,7 +111,7 @@ class DevToolsManager : public DevToolsClientHost::CloseListener,
 
   void BindClientHost(RenderViewHost* inspected_rvh,
                       DevToolsClientHost* client_host,
-                      const RuntimeFeatures& runtime_features);
+                      const DevToolsRuntimeProperties& runtime_properties);
 
   void UnbindClientHost(RenderViewHost* inspected_rvh,
                         DevToolsClientHost* client_host);
@@ -132,14 +132,15 @@ class DevToolsManager : public DevToolsClientHost::CloseListener,
       ClientHostToInspectedRvhMap;
   ClientHostToInspectedRvhMap client_host_to_inspected_rvh_;
 
-  typedef std::map<RenderViewHost*, RuntimeFeatures>
-      RuntimeFeaturesMap;
-  RuntimeFeaturesMap runtime_features_map_;
+  typedef std::map<RenderViewHost*, DevToolsRuntimeProperties>
+      RuntimePropertiesMap;
+  RuntimePropertiesMap runtime_properties_map_;
 
   RenderViewHost* inspected_rvh_for_reopen_;
   bool in_initial_show_;
 
-  typedef std::map<int, std::pair<DevToolsClientHost*, RuntimeFeatures> >
+  typedef std::map<int,
+                   std::pair<DevToolsClientHost*, DevToolsRuntimeProperties> >
       OrphanClientHosts;
   OrphanClientHosts orphan_client_hosts_;
   int last_orphan_cookie_;