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

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

Issue 12194007: Revert 180055: Very likely caused http://crbug.com/173885 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/ui/webui/tracing_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/message_loop_proxy.h" 10 #include "base/message_loop_proxy.h"
(...skipping 27 matching lines...) Expand all
38 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" 38 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
39 #include "chrome/browser/ui/webui/options/options_ui.h" 39 #include "chrome/browser/ui/webui/options/options_ui.h"
40 #include "chrome/browser/ui/webui/performance_monitor/performance_monitor_ui.h" 40 #include "chrome/browser/ui/webui/performance_monitor/performance_monitor_ui.h"
41 #include "chrome/browser/ui/webui/plugins_ui.h" 41 #include "chrome/browser/ui/webui/plugins_ui.h"
42 #include "chrome/browser/ui/webui/predictors/predictors_ui.h" 42 #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
43 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" 43 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
44 #include "chrome/browser/ui/webui/profiler_ui.h" 44 #include "chrome/browser/ui/webui/profiler_ui.h"
45 #include "chrome/browser/ui/webui/quota_internals_ui.h" 45 #include "chrome/browser/ui/webui/quota_internals_ui.h"
46 #include "chrome/browser/ui/webui/signin_internals_ui.h" 46 #include "chrome/browser/ui/webui/signin_internals_ui.h"
47 #include "chrome/browser/ui/webui/sync_internals_ui.h" 47 #include "chrome/browser/ui/webui/sync_internals_ui.h"
48 #include "chrome/browser/ui/webui/tracing_ui.h"
48 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h" 49 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
49 #include "chrome/browser/ui/webui/version_ui.h" 50 #include "chrome/browser/ui/webui/version_ui.h"
50 #include "chrome/common/chrome_switches.h" 51 #include "chrome/common/chrome_switches.h"
51 #include "chrome/common/extensions/extension_constants.h" 52 #include "chrome/common/extensions/extension_constants.h"
52 #include "chrome/common/extensions/feature_switch.h" 53 #include "chrome/common/extensions/feature_switch.h"
53 #include "chrome/common/pref_names.h" 54 #include "chrome/common/pref_names.h"
54 #include "chrome/common/url_constants.h" 55 #include "chrome/common/url_constants.h"
55 #include "content/public/browser/web_contents.h" 56 #include "content/public/browser/web_contents.h"
56 #include "content/public/browser/web_ui.h" 57 #include "content/public/browser/web_ui.h"
57 #include "content/public/common/content_client.h" 58 #include "content/public/common/content_client.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 if (url.host() == chrome::kChromeUIPerformanceMonitorHost) 278 if (url.host() == chrome::kChromeUIPerformanceMonitorHost)
278 return &NewWebUI<performance_monitor::PerformanceMonitorUI>; 279 return &NewWebUI<performance_monitor::PerformanceMonitorUI>;
279 // Android does not support plugins for now. 280 // Android does not support plugins for now.
280 if (url.host() == chrome::kChromeUIPluginsHost) 281 if (url.host() == chrome::kChromeUIPluginsHost)
281 return &NewWebUI<PluginsUI>; 282 return &NewWebUI<PluginsUI>;
282 // Settings are implemented with native UI elements on Android. 283 // Settings are implemented with native UI elements on Android.
283 if (url.host() == chrome::kChromeUISettingsFrameHost) 284 if (url.host() == chrome::kChromeUISettingsFrameHost)
284 return &NewWebUI<options::OptionsUI>; 285 return &NewWebUI<options::OptionsUI>;
285 if (url.host() == chrome::kChromeUISuggestionsInternalsHost) 286 if (url.host() == chrome::kChromeUISuggestionsInternalsHost)
286 return &NewWebUI<SuggestionsInternalsUI>; 287 return &NewWebUI<SuggestionsInternalsUI>;
288 if (url.host() == chrome::kChromeUITracingHost)
289 return &NewWebUI<TracingUI>;
287 // Uber frame is not used on Android. 290 // Uber frame is not used on Android.
288 if (url.host() == chrome::kChromeUIUberFrameHost) 291 if (url.host() == chrome::kChromeUIUberFrameHost)
289 return &NewWebUI<UberFrameUI>; 292 return &NewWebUI<UberFrameUI>;
290 // Uber page is not used on Android. 293 // Uber page is not used on Android.
291 if (url.host() == chrome::kChromeUIUberHost) 294 if (url.host() == chrome::kChromeUIUberHost)
292 return &NewWebUI<UberUI>; 295 return &NewWebUI<UberUI>;
293 #endif 296 #endif
294 #if defined(OS_WIN) 297 #if defined(OS_WIN)
295 if (url.host() == chrome::kChromeUIConflictsHost) 298 if (url.host() == chrome::kChromeUIConflictsHost)
296 return &NewWebUI<ConflictsUI>; 299 return &NewWebUI<ConflictsUI>;
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 if (page_url.host() == chrome::kChromeUISettingsFrameHost) 559 if (page_url.host() == chrome::kChromeUISettingsFrameHost)
557 return options::OptionsUI::GetFaviconResourceBytes(scale_factor); 560 return options::OptionsUI::GetFaviconResourceBytes(scale_factor);
558 561
559 // Android doesn't use the plugins pages. 562 // Android doesn't use the plugins pages.
560 if (page_url.host() == chrome::kChromeUIPluginsHost) 563 if (page_url.host() == chrome::kChromeUIPluginsHost)
561 return PluginsUI::GetFaviconResourceBytes(scale_factor); 564 return PluginsUI::GetFaviconResourceBytes(scale_factor);
562 #endif 565 #endif
563 566
564 return NULL; 567 return NULL;
565 } 568 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/ui/webui/tracing_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698