Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Side by Side Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Issue 10820031: Modifications to performance monitor UI to address real webui. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Revised build config to mollify Android tryserver Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 if (url.host() == chrome::kChromeUIFlagsHost) 257 if (url.host() == chrome::kChromeUIFlagsHost)
257 return &NewWebUI<FlagsUI>; 258 return &NewWebUI<FlagsUI>;
258 // chrome://inspect isn't supported on Android. Page debugging is handled by a 259 // chrome://inspect isn't supported on Android. Page debugging is handled by a
259 // remote devtools on the host machine, and other elements (Shared Workers, 260 // remote devtools on the host machine, and other elements (Shared Workers,
260 // extensions, etc) aren't supported. 261 // extensions, etc) aren't supported.
261 if (url.host() == chrome::kChromeUIInspectHost) 262 if (url.host() == chrome::kChromeUIInspectHost)
262 return &NewWebUI<InspectUI>; 263 return &NewWebUI<InspectUI>;
263 // Android does not support plugins for now. 264 // Android does not support plugins for now.
264 if (url.host() == chrome::kChromeUIPluginsHost) 265 if (url.host() == chrome::kChromeUIPluginsHost)
265 return &NewWebUI<PluginsUI>; 266 return &NewWebUI<PluginsUI>;
267 // Performance monitoring page is not on Android for now.
268 if (url.host() == chrome::kChromeUIPerformanceMonitorHost)
269 return &NewWebUI<performance_monitor::WebUI>;
266 #endif 270 #endif
267 #if defined(ENABLE_EXTENSIONS) 271 #if defined(ENABLE_EXTENSIONS)
268 if (url.host() == chrome::kChromeUIExtensionsFrameHost) 272 if (url.host() == chrome::kChromeUIExtensionsFrameHost)
269 return &NewWebUI<ExtensionsUI>; 273 return &NewWebUI<ExtensionsUI>;
270 #endif 274 #endif
271 #if defined(ENABLE_PRINTING) 275 #if defined(ENABLE_PRINTING)
272 if (url.host() == chrome::kChromeUIPrintHost && 276 if (url.host() == chrome::kChromeUIPrintHost &&
273 !profile->GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled)) 277 !profile->GetPrefs()->GetBoolean(prefs::kPrintPreviewDisabled))
274 return &NewWebUI<PrintPreviewUI>; 278 return &NewWebUI<PrintPreviewUI>;
275 #endif 279 #endif
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 if (page_url.host() == chrome::kChromeUISettingsFrameHost) 545 if (page_url.host() == chrome::kChromeUISettingsFrameHost)
542 return options2::OptionsUI::GetFaviconResourceBytes(); 546 return options2::OptionsUI::GetFaviconResourceBytes();
543 547
544 // Android doesn't use the plugins pages. 548 // Android doesn't use the plugins pages.
545 if (page_url.host() == chrome::kChromeUIPluginsHost) 549 if (page_url.host() == chrome::kChromeUIPluginsHost)
546 return PluginsUI::GetFaviconResourceBytes(); 550 return PluginsUI::GetFaviconResourceBytes();
547 #endif 551 #endif
548 552
549 return NULL; 553 return NULL;
550 } 554 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/performance_monitor/chart.js ('k') | chrome/browser/ui/webui/performance_monitor/web_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698