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/browser_about_handler.h" | 5 #include "chrome/browser/browser_about_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 host = chrome::kChromeUISyncInternalsHost; | 122 host = chrome::kChromeUISyncInternalsHost; |
123 // Redirect chrome://extensions. | 123 // Redirect chrome://extensions. |
124 } else if (host == chrome::kChromeUIExtensionsHost) { | 124 } else if (host == chrome::kChromeUIExtensionsHost) { |
125 if (enableUberPage) { | 125 if (enableUberPage) { |
126 host = chrome::kChromeUIUberHost; | 126 host = chrome::kChromeUIUberHost; |
127 path = chrome::kChromeUIExtensionsHost + url->path(); | 127 path = chrome::kChromeUIExtensionsHost + url->path(); |
128 } else { | 128 } else { |
129 host = chrome::kChromeUISettingsHost; | 129 host = chrome::kChromeUISettingsHost; |
130 path = chrome::kExtensionsSubPage; | 130 path = chrome::kExtensionsSubPage; |
131 } | 131 } |
| 132 } else if (host == chrome::kChromeUIHistoryHost) { |
| 133 if (enableUberPage) { |
| 134 host = chrome::kChromeUIUberHost; |
| 135 path = chrome::kChromeUIHistoryHost + url->path(); |
| 136 } else { |
| 137 host = chrome::kChromeUIHistoryFrameHost; |
| 138 } |
132 // Redirect chrome://settings/extensions. | 139 // Redirect chrome://settings/extensions. |
133 // TODO(csilv): Fix all code paths for this page once Uber page is enabled | 140 // TODO(csilv): Fix all code paths for this page once Uber page is enabled |
134 // permanently. | 141 // permanently. |
135 } else if (enableUberPage && host == chrome::kChromeUISettingsHost && | 142 } else if (enableUberPage && host == chrome::kChromeUISettingsHost && |
136 url->path() == std::string("/") + chrome::kExtensionsSubPage) { | 143 url->path() == std::string("/") + chrome::kExtensionsSubPage) { |
137 host = chrome::kChromeUIUberHost; | 144 host = chrome::kChromeUIUberHost; |
138 path = chrome::kChromeUIExtensionsHost; | 145 path = chrome::kChromeUIExtensionsHost; |
139 // Redirect chrome://settings | 146 // Redirect chrome://settings |
140 } else if (enableUberPage && host == chrome::kChromeUISettingsHost) { | 147 } else if (enableUberPage && host == chrome::kChromeUISettingsHost) { |
141 host = chrome::kChromeUIUberHost; | 148 host = chrome::kChromeUIUberHost; |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 AboutTcmallocOutputs::AboutTcmallocOutputs() {} | 214 AboutTcmallocOutputs::AboutTcmallocOutputs() {} |
208 | 215 |
209 AboutTcmallocOutputs::~AboutTcmallocOutputs() {} | 216 AboutTcmallocOutputs::~AboutTcmallocOutputs() {} |
210 | 217 |
211 // Glue between the callback task and the method in the singleton. | 218 // Glue between the callback task and the method in the singleton. |
212 void AboutTcmallocRendererCallback(base::ProcessId pid, | 219 void AboutTcmallocRendererCallback(base::ProcessId pid, |
213 const std::string& output) { | 220 const std::string& output) { |
214 AboutTcmallocOutputs::GetInstance()->RendererCallback(pid, output); | 221 AboutTcmallocOutputs::GetInstance()->RendererCallback(pid, output); |
215 } | 222 } |
216 #endif | 223 #endif |
OLD | NEW |