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

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

Issue 8511055: Remove old history UI, and replace with history2. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Suppress bidichecker test failure. Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/resources/history2.js ('k') | chrome/browser/ui/webui/history2_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_factory.h" 5 #include "chrome/browser/ui/webui/chrome_web_ui_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"
11 #include "chrome/browser/history/history_types.h" 11 #include "chrome/browser/history/history_types.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/ui/webui/bookmarks_ui.h" 14 #include "chrome/browser/ui/webui/bookmarks_ui.h"
15 #include "chrome/browser/ui/webui/bug_report_ui.h" 15 #include "chrome/browser/ui/webui/bug_report_ui.h"
16 #include "chrome/browser/ui/webui/constrained_html_ui.h" 16 #include "chrome/browser/ui/webui/constrained_html_ui.h"
17 #include "chrome/browser/ui/webui/crashes_ui.h" 17 #include "chrome/browser/ui/webui/crashes_ui.h"
18 #include "chrome/browser/ui/webui/devtools_ui.h" 18 #include "chrome/browser/ui/webui/devtools_ui.h"
19 #include "chrome/browser/ui/webui/downloads_ui.h" 19 #include "chrome/browser/ui/webui/downloads_ui.h"
20 #include "chrome/browser/ui/webui/edit_search_engine_dialog_ui_webui.h" 20 #include "chrome/browser/ui/webui/edit_search_engine_dialog_ui_webui.h"
21 #include "chrome/browser/ui/webui/task_manager_ui.h" 21 #include "chrome/browser/ui/webui/task_manager_ui.h"
22 #include "chrome/browser/ui/webui/flags_ui.h" 22 #include "chrome/browser/ui/webui/flags_ui.h"
23 #include "chrome/browser/ui/webui/flash_ui.h" 23 #include "chrome/browser/ui/webui/flash_ui.h"
24 #include "chrome/browser/ui/webui/gpu_internals_ui.h" 24 #include "chrome/browser/ui/webui/gpu_internals_ui.h"
25 #include "chrome/browser/ui/webui/history2_ui.h"
26 #include "chrome/browser/ui/webui/history_ui.h" 25 #include "chrome/browser/ui/webui/history_ui.h"
27 #include "chrome/browser/ui/webui/html_dialog_ui.h" 26 #include "chrome/browser/ui/webui/html_dialog_ui.h"
28 #include "chrome/browser/ui/webui/hung_renderer_dialog_ui.h" 27 #include "chrome/browser/ui/webui/hung_renderer_dialog_ui.h"
29 #include "chrome/browser/ui/webui/input_window_dialog_ui.h" 28 #include "chrome/browser/ui/webui/input_window_dialog_ui.h"
30 #include "chrome/browser/ui/webui/media/media_internals_ui.h" 29 #include "chrome/browser/ui/webui/media/media_internals_ui.h"
31 #include "chrome/browser/ui/webui/net_internals_ui.h" 30 #include "chrome/browser/ui/webui/net_internals_ui.h"
32 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 31 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
33 #include "chrome/browser/ui/webui/options/options_ui.h" 32 #include "chrome/browser/ui/webui/options/options_ui.h"
34 #include "chrome/browser/ui/webui/plugins_ui.h" 33 #include "chrome/browser/ui/webui/plugins_ui.h"
35 #include "chrome/browser/ui/webui/policy_ui.h" 34 #include "chrome/browser/ui/webui/policy_ui.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 if (url.host() == chrome::kChromeUIDownloadsHost) 167 if (url.host() == chrome::kChromeUIDownloadsHost)
169 return &NewWebUI<DownloadsUI>; 168 return &NewWebUI<DownloadsUI>;
170 if (url.host() == chrome::kChromeUIEditSearchEngineDialogHost) 169 if (url.host() == chrome::kChromeUIEditSearchEngineDialogHost)
171 return &NewWebUI<EditSearchEngineDialogUI>; 170 return &NewWebUI<EditSearchEngineDialogUI>;
172 if (url.host() == chrome::kChromeUIFlagsHost) 171 if (url.host() == chrome::kChromeUIFlagsHost)
173 return &NewWebUI<FlagsUI>; 172 return &NewWebUI<FlagsUI>;
174 if (url.host() == chrome::kChromeUIFlashHost) 173 if (url.host() == chrome::kChromeUIFlashHost)
175 return &NewWebUI<FlashUI>; 174 return &NewWebUI<FlashUI>;
176 if (url.host() == chrome::kChromeUIGpuInternalsHost) 175 if (url.host() == chrome::kChromeUIGpuInternalsHost)
177 return &NewWebUI<GpuInternalsUI>; 176 return &NewWebUI<GpuInternalsUI>;
178 if (url.host() == chrome::kChromeUIHistory2Host)
179 return &NewWebUI<HistoryUI2>;
180 if (url.host() == chrome::kChromeUIHistoryHost) 177 if (url.host() == chrome::kChromeUIHistoryHost)
181 return &NewWebUI<HistoryUI>; 178 return &NewWebUI<HistoryUI>;
182 if (url.host() == chrome::kChromeUIHungRendererDialogHost) 179 if (url.host() == chrome::kChromeUIHungRendererDialogHost)
183 return &NewWebUI<HungRendererDialogUI>; 180 return &NewWebUI<HungRendererDialogUI>;
184 if (url.host() == chrome::kChromeUIInputWindowDialogHost) 181 if (url.host() == chrome::kChromeUIInputWindowDialogHost)
185 return &NewWebUI<InputWindowDialogUI>; 182 return &NewWebUI<InputWindowDialogUI>;
186 #if defined(USE_VIRTUAL_KEYBOARD) 183 #if defined(USE_VIRTUAL_KEYBOARD)
187 if (url.host() == chrome::kChromeUIKeyboardHost) 184 if (url.host() == chrome::kChromeUIKeyboardHost)
188 return &NewWebUI<KeyboardUI>; 185 return &NewWebUI<KeyboardUI>;
189 #endif 186 #endif
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 389
393 if (page_url.host() == chrome::kChromeUICrashesHost) 390 if (page_url.host() == chrome::kChromeUICrashesHost)
394 return CrashesUI::GetFaviconResourceBytes(); 391 return CrashesUI::GetFaviconResourceBytes();
395 392
396 if (page_url.host() == chrome::kChromeUIDownloadsHost) 393 if (page_url.host() == chrome::kChromeUIDownloadsHost)
397 return DownloadsUI::GetFaviconResourceBytes(); 394 return DownloadsUI::GetFaviconResourceBytes();
398 395
399 if (page_url.host() == chrome::kChromeUIHistoryHost) 396 if (page_url.host() == chrome::kChromeUIHistoryHost)
400 return HistoryUI::GetFaviconResourceBytes(); 397 return HistoryUI::GetFaviconResourceBytes();
401 398
402 if (page_url.host() == chrome::kChromeUIHistory2Host)
403 return HistoryUI2::GetFaviconResourceBytes();
404
405 if (page_url.host() == chrome::kChromeUIFlagsHost) 399 if (page_url.host() == chrome::kChromeUIFlagsHost)
406 return FlagsUI::GetFaviconResourceBytes(); 400 return FlagsUI::GetFaviconResourceBytes();
407 401
408 if (page_url.host() == chrome::kChromeUISessionsHost) 402 if (page_url.host() == chrome::kChromeUISessionsHost)
409 return SessionsUI::GetFaviconResourceBytes(); 403 return SessionsUI::GetFaviconResourceBytes();
410 404
411 if (page_url.host() == chrome::kChromeUIFlashHost) 405 if (page_url.host() == chrome::kChromeUIFlashHost)
412 return FlashUI::GetFaviconResourceBytes(); 406 return FlashUI::GetFaviconResourceBytes();
413 407
414 if (page_url.host() == chrome::kChromeUISettingsHost) 408 if (page_url.host() == chrome::kChromeUISettingsHost)
415 return OptionsUI::GetFaviconResourceBytes(); 409 return OptionsUI::GetFaviconResourceBytes();
416 410
417 if (page_url.host() == chrome::kChromeUIPluginsHost) 411 if (page_url.host() == chrome::kChromeUIPluginsHost)
418 return PluginsUI::GetFaviconResourceBytes(); 412 return PluginsUI::GetFaviconResourceBytes();
419 413
420 return NULL; 414 return NULL;
421 } 415 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/history2.js ('k') | chrome/browser/ui/webui/history2_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698