Chromium Code Reviews| 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/chrome_web_ui_controller_factory.h" | 5 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/about_flags.h" | 8 #include "chrome/browser/about_flags.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/extension_web_ui.h" | 10 #include "chrome/browser/extensions/extension_web_ui.h" |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 #include "chrome/browser/ui/webui/inspect_ui.h" | 32 #include "chrome/browser/ui/webui/inspect_ui.h" |
| 33 #include "chrome/browser/ui/webui/instant_ui.h" | 33 #include "chrome/browser/ui/webui/instant_ui.h" |
| 34 #include "chrome/browser/ui/webui/media/media_internals_ui.h" | 34 #include "chrome/browser/ui/webui/media/media_internals_ui.h" |
| 35 #if !defined(DISABLE_NACL) | 35 #if !defined(DISABLE_NACL) |
| 36 #include "chrome/browser/ui/webui/nacl_ui.h" | 36 #include "chrome/browser/ui/webui/nacl_ui.h" |
| 37 #endif | 37 #endif |
| 38 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" | 38 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" |
| 39 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 39 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 40 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" | 40 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" |
| 41 #include "chrome/browser/ui/webui/options2/options_ui.h" | 41 #include "chrome/browser/ui/webui/options2/options_ui.h" |
| 42 #include "chrome/browser/ui/webui/performance_monitor/web_ui.h" | |
| 42 #include "chrome/browser/ui/webui/plugins_ui.h" | 43 #include "chrome/browser/ui/webui/plugins_ui.h" |
| 43 #include "chrome/browser/ui/webui/policy_ui.h" | 44 #include "chrome/browser/ui/webui/policy_ui.h" |
| 44 #include "chrome/browser/ui/webui/predictors/predictors_ui.h" | 45 #include "chrome/browser/ui/webui/predictors/predictors_ui.h" |
| 45 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" | 46 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" |
| 46 #include "chrome/browser/ui/webui/profiler_ui.h" | 47 #include "chrome/browser/ui/webui/profiler_ui.h" |
| 47 #include "chrome/browser/ui/webui/quota_internals_ui.h" | 48 #include "chrome/browser/ui/webui/quota_internals_ui.h" |
| 48 #include "chrome/browser/ui/webui/suggestions_internals/suggestions_internals_ui .h" | 49 #include "chrome/browser/ui/webui/suggestions_internals/suggestions_internals_ui .h" |
| 49 #include "chrome/browser/ui/webui/sync_internals_ui.h" | 50 #include "chrome/browser/ui/webui/sync_internals_ui.h" |
| 50 #include "chrome/browser/ui/webui/task_manager/task_manager_ui.h" | 51 #include "chrome/browser/ui/webui/task_manager/task_manager_ui.h" |
| 51 #include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h" | 52 #include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 206 if (url.host() == chrome::kChromeUIMediaInternalsHost) | 207 if (url.host() == chrome::kChromeUIMediaInternalsHost) |
| 207 return &NewWebUI<MediaInternalsUI>; | 208 return &NewWebUI<MediaInternalsUI>; |
| 208 #if !defined(DISABLE_NACL) | 209 #if !defined(DISABLE_NACL) |
| 209 if (url.host() == chrome::kChromeUINaClHost) | 210 if (url.host() == chrome::kChromeUINaClHost) |
| 210 return &NewWebUI<NaClUI>; | 211 return &NewWebUI<NaClUI>; |
| 211 #endif | 212 #endif |
| 212 if (url.host() == chrome::kChromeUINetInternalsHost) | 213 if (url.host() == chrome::kChromeUINetInternalsHost) |
| 213 return &NewWebUI<NetInternalsUI>; | 214 return &NewWebUI<NetInternalsUI>; |
| 214 if (url.host() == chrome::kChromeUIOmniboxHost) | 215 if (url.host() == chrome::kChromeUIOmniboxHost) |
| 215 return &NewWebUI<OmniboxUI>; | 216 return &NewWebUI<OmniboxUI>; |
| 217 if (url.host() == chrome::kChromeUIPerformanceMonitorHost) | |
|
Yaron
2012/08/17 20:08:20
So I think this is causing your linker error on An
| |
| 218 return &NewWebUI<performance_monitor::WebUI>; | |
| 216 if (url.host() == chrome::kChromeUIPredictorsHost) | 219 if (url.host() == chrome::kChromeUIPredictorsHost) |
| 217 return &NewWebUI<PredictorsUI>; | 220 return &NewWebUI<PredictorsUI>; |
| 218 if (url.host() == chrome::kChromeUIProfilerHost) | 221 if (url.host() == chrome::kChromeUIProfilerHost) |
| 219 return &NewWebUI<ProfilerUI>; | 222 return &NewWebUI<ProfilerUI>; |
| 220 if (url.host() == chrome::kChromeUIQuotaInternalsHost) | 223 if (url.host() == chrome::kChromeUIQuotaInternalsHost) |
| 221 return &NewWebUI<QuotaInternalsUI>; | 224 return &NewWebUI<QuotaInternalsUI>; |
| 222 if (url.host() == chrome::kChromeUISyncInternalsHost) | 225 if (url.host() == chrome::kChromeUISyncInternalsHost) |
| 223 return &NewWebUI<SyncInternalsUI>; | 226 return &NewWebUI<SyncInternalsUI>; |
| 224 if (url.host() == chrome::kChromeUISyncResourcesHost) | 227 if (url.host() == chrome::kChromeUISyncResourcesHost) |
| 225 return &NewWebUI<WebDialogUI>; | 228 return &NewWebUI<WebDialogUI>; |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 534 if (page_url.host() == chrome::kChromeUISettingsFrameHost) | 537 if (page_url.host() == chrome::kChromeUISettingsFrameHost) |
| 535 return options2::OptionsUI::GetFaviconResourceBytes(); | 538 return options2::OptionsUI::GetFaviconResourceBytes(); |
| 536 | 539 |
| 537 // Android doesn't use the plugins pages. | 540 // Android doesn't use the plugins pages. |
| 538 if (page_url.host() == chrome::kChromeUIPluginsHost) | 541 if (page_url.host() == chrome::kChromeUIPluginsHost) |
| 539 return PluginsUI::GetFaviconResourceBytes(); | 542 return PluginsUI::GetFaviconResourceBytes(); |
| 540 #endif | 543 #endif |
| 541 | 544 |
| 542 return NULL; | 545 return NULL; |
| 543 } | 546 } |
| OLD | NEW |