OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/chromeos/about_network.h" | 5 #include "chrome/browser/ui/webui/chromeos/about_network.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 } // namespace | 278 } // namespace |
279 | 279 |
280 namespace about_ui { | 280 namespace about_ui { |
281 | 281 |
282 std::string AboutNetwork(const std::string& query) { | 282 std::string AboutNetwork(const std::string& query) { |
283 int refresh; | 283 int refresh; |
284 base::StringToInt(query, &refresh); | 284 base::StringToInt(query, &refresh); |
285 std::string output = GetHeaderHtmlInfo(refresh); | 285 std::string output = GetHeaderHtmlInfo(refresh); |
286 if (network_event_log::IsInitialized()) | 286 if (network_event_log::IsInitialized()) |
287 output += GetHeaderEventLogInfo(); | 287 output += GetHeaderEventLogInfo(); |
288 if (CommandLine::ForCurrentProcess()->HasSwitch( | 288 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
289 ash::switches::kAshEnableNewNetworkStatusArea)) { | 289 ash::switches::kAshDisableNewNetworkStatusArea)) { |
290 output += GetNetworkStateHtmlInfo(); | 290 output += GetNetworkStateHtmlInfo(); |
291 } else { | 291 } else { |
292 output += GetCrosNetworkHtmlInfo(); | 292 output += GetCrosNetworkHtmlInfo(); |
293 } | 293 } |
294 return output; | 294 return output; |
295 } | 295 } |
296 | 296 |
297 } // namespace about_ui | 297 } // namespace about_ui |
298 | 298 |
299 } // namespace chromeos | 299 } // namespace chromeos |
OLD | NEW |