Index: chrome/browser/devtools/devtools_ui_bindings.cc |
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc |
index 9724be06658d73b45c2683e168d3eee56687b7c9..2ce563909ca5fd5d1099588d94021c00a02da74b 100644 |
--- a/chrome/browser/devtools/devtools_ui_bindings.cc |
+++ b/chrome/browser/devtools/devtools_ui_bindings.cc |
@@ -298,16 +298,16 @@ void DevToolsUIBindings::FrontendWebContentsObserver:: |
// DevToolsUIBindings --------------------------------------------------------- |
DevToolsUIBindings* DevToolsUIBindings::ForWebContents( |
- content::WebContents* web_contents) { |
- if (g_instances == NULL) |
- return NULL; |
- DevToolsUIBindingsList* instances = g_instances.Pointer(); |
- for (DevToolsUIBindingsList::iterator it(instances->begin()); |
- it != instances->end(); ++it) { |
- if ((*it)->web_contents() == web_contents) |
- return *it; |
- } |
- return NULL; |
+ content::WebContents* web_contents) { |
+ if (g_instances == NULL) |
+ return NULL; |
+ DevToolsUIBindingsList* instances = g_instances.Pointer(); |
+ for (DevToolsUIBindingsList::iterator it(instances->begin()); |
+ it != instances->end(); ++it) { |
+ if ((*it)->web_contents() == web_contents) |
+ return *it; |
+ } |
+ return NULL; |
} |
// static |
@@ -319,7 +319,7 @@ GURL DevToolsUIBindings::ApplyThemeToURL(Profile* profile, |
std::string url_string( |
frontend_url + |
((frontend_url.find("?") == std::string::npos) ? "?" : "&") + |
- "dockSide=undocked" + // TODO(dgozman): remove this support in M38. |
+ "dockSide=undocked" + // TODO(dgozman): remove this support in M38. |
"&toolbarColor=" + |
SkColorToRGBAString(tp->GetColor(ThemeProperties::COLOR_TOOLBAR)) + |
"&textColor=" + |
@@ -674,11 +674,13 @@ void DevToolsUIBindings::SendMessageToBrowser(const std::string& message) { |
agent_host_->DispatchProtocolMessage(message); |
} |
+#if !defined(OS_ANDROID) && !defined(OS_IOS) |
void DevToolsUIBindings::DeviceCountChanged(int count) { |
base::FundamentalValue value(count); |
CallClientFunction("InspectorFrontendAPI.deviceCountUpdated", &value, NULL, |
NULL); |
} |
+#endif |
void DevToolsUIBindings::DevicesUpdated( |
const std::string& source, |