| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser_about_handler.h" | 5 #include "chrome/browser/browser_about_handler.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 #include "grit/chromium_strings.h" | 49 #include "grit/chromium_strings.h" |
| 50 #include "grit/generated_resources.h" | 50 #include "grit/generated_resources.h" |
| 51 #include "grit/locale_settings.h" | 51 #include "grit/locale_settings.h" |
| 52 #include "webkit/glue/webkit_glue.h" | 52 #include "webkit/glue/webkit_glue.h" |
| 53 #ifdef CHROME_V8 | 53 #ifdef CHROME_V8 |
| 54 #include "v8/include/v8.h" | 54 #include "v8/include/v8.h" |
| 55 #endif | 55 #endif |
| 56 | 56 |
| 57 #if defined(OS_WIN) | 57 #if defined(OS_WIN) |
| 58 #include "chrome/browser/views/about_ipc_dialog.h" | 58 #include "chrome/browser/views/about_ipc_dialog.h" |
| 59 #include "chrome/browser/views/about_network_dialog.h" | |
| 60 #elif defined(OS_CHROMEOS) | 59 #elif defined(OS_CHROMEOS) |
| 61 #include "chrome/browser/chromeos/cros/cros_library.h" | 60 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 62 #include "chrome/browser/chromeos/cros/network_library.h" | 61 #include "chrome/browser/chromeos/cros/network_library.h" |
| 63 #include "chrome/browser/chromeos/cros/syslogs_library.h" | 62 #include "chrome/browser/chromeos/cros/syslogs_library.h" |
| 64 #include "chrome/browser/chromeos/version_loader.h" | 63 #include "chrome/browser/chromeos/version_loader.h" |
| 65 #elif defined(OS_MACOSX) | 64 #elif defined(OS_MACOSX) |
| 66 #include "chrome/browser/cocoa/about_ipc_dialog.h" | 65 #include "chrome/browser/cocoa/about_ipc_dialog.h" |
| 67 #endif | 66 #endif |
| 68 | 67 |
| 69 #if defined(USE_TCMALLOC) | 68 #if defined(USE_TCMALLOC) |
| (...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1083 // scheme. | 1082 // scheme. |
| 1084 std::string about_url = "chrome://about/"; | 1083 std::string about_url = "chrome://about/"; |
| 1085 about_url.append(url->path()); | 1084 about_url.append(url->path()); |
| 1086 *url = GURL(about_url); | 1085 *url = GURL(about_url); |
| 1087 return true; | 1086 return true; |
| 1088 } | 1087 } |
| 1089 | 1088 |
| 1090 // This function gets called with the fixed-up chrome: URLs, so we have to | 1089 // This function gets called with the fixed-up chrome: URLs, so we have to |
| 1091 // compare against those instead of "about:blah". | 1090 // compare against those instead of "about:blah". |
| 1092 bool HandleNonNavigationAboutURL(const GURL& url) { | 1091 bool HandleNonNavigationAboutURL(const GURL& url) { |
| 1093 // About:network and IPC and currently buggy, so we disable it for official | 1092 // about:ipc is currently buggy, so we disable it for official builds. |
| 1094 // builds. | |
| 1095 #if !defined(OFFICIAL_BUILD) | 1093 #if !defined(OFFICIAL_BUILD) |
| 1096 | 1094 |
| 1097 #if defined(OS_WIN) | |
| 1098 if (LowerCaseEqualsASCII(url.spec(), chrome::kChromeUINetworkURL)) { | |
| 1099 // Run the dialog. This will re-use the existing one if it's already up. | |
| 1100 AboutNetworkDialog::RunDialog(); | |
| 1101 return true; | |
| 1102 } | |
| 1103 #endif | |
| 1104 | |
| 1105 #if (defined(OS_MACOSX) || defined(OS_WIN)) && defined(IPC_MESSAGE_LOG_ENABLED) | 1095 #if (defined(OS_MACOSX) || defined(OS_WIN)) && defined(IPC_MESSAGE_LOG_ENABLED) |
| 1106 if (LowerCaseEqualsASCII(url.spec(), chrome::kChromeUIIPCURL)) { | 1096 if (LowerCaseEqualsASCII(url.spec(), chrome::kChromeUIIPCURL)) { |
| 1107 // Run the dialog. This will re-use the existing one if it's already up. | 1097 // Run the dialog. This will re-use the existing one if it's already up. |
| 1108 AboutIPCDialog::RunDialog(); | 1098 AboutIPCDialog::RunDialog(); |
| 1109 return true; | 1099 return true; |
| 1110 } | 1100 } |
| 1111 #endif | 1101 #endif |
| 1112 | 1102 |
| 1113 #endif // OFFICIAL_BUILD | 1103 #endif // OFFICIAL_BUILD |
| 1114 | 1104 |
| 1115 return false; | 1105 return false; |
| 1116 } | 1106 } |
| OLD | NEW |