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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 8 years, 5 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/ui/chrome_pages.cc ('k') | chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc » ('j') | chrome/browser/ui/webui/options2/advanced_options_utils.h » ('J')
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/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/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 18 matching lines...) Expand all
29 #include "chrome/browser/ui/webui/generic_handler.h" 29 #include "chrome/browser/ui/webui/generic_handler.h"
30 #include "chrome/browser/ui/webui/gpu_internals_ui.h" 30 #include "chrome/browser/ui/webui/gpu_internals_ui.h"
31 #include "chrome/browser/ui/webui/help/help_ui.h" 31 #include "chrome/browser/ui/webui/help/help_ui.h"
32 #include "chrome/browser/ui/webui/history_ui.h" 32 #include "chrome/browser/ui/webui/history_ui.h"
33 #include "chrome/browser/ui/webui/inspect_ui.h" 33 #include "chrome/browser/ui/webui/inspect_ui.h"
34 #include "chrome/browser/ui/webui/instant_ui.h" 34 #include "chrome/browser/ui/webui/instant_ui.h"
35 #include "chrome/browser/ui/webui/media/media_internals_ui.h" 35 #include "chrome/browser/ui/webui/media/media_internals_ui.h"
36 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" 36 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
37 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 37 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
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/options2/options_ui2.h" 39 #include "chrome/browser/ui/webui/options2/options_ui.h"
40 #include "chrome/browser/ui/webui/plugins_ui.h" 40 #include "chrome/browser/ui/webui/plugins_ui.h"
41 #include "chrome/browser/ui/webui/policy_ui.h" 41 #include "chrome/browser/ui/webui/policy_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/suggestions_internals/suggestions_internals_ui .h" 46 #include "chrome/browser/ui/webui/suggestions_internals/suggestions_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/task_manager/task_manager_ui.h" 48 #include "chrome/browser/ui/webui/task_manager/task_manager_ui.h"
49 #include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h" 49 #include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h"
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 if (page_url.host() == chrome::kChromeUISettingsFrameHost) 521 if (page_url.host() == chrome::kChromeUISettingsFrameHost)
522 return options2::OptionsUI::GetFaviconResourceBytes(); 522 return options2::OptionsUI::GetFaviconResourceBytes();
523 523
524 // Android doesn't use the plugins pages. 524 // Android doesn't use the plugins pages.
525 if (page_url.host() == chrome::kChromeUIPluginsHost) 525 if (page_url.host() == chrome::kChromeUIPluginsHost)
526 return PluginsUI::GetFaviconResourceBytes(); 526 return PluginsUI::GetFaviconResourceBytes();
527 #endif 527 #endif
528 528
529 return NULL; 529 return NULL;
530 } 530 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/chrome_pages.cc ('k') | chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc » ('j') | chrome/browser/ui/webui/options2/advanced_options_utils.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698