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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/webui/options2/options_ui.cc

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/webui/options2/options_ui.h ('k') | chrome/browser/ui/webui/options2/options_ui2.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/options2/options_ui2.h" 5 #include "chrome/browser/ui/webui/options2/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/ref_counted_memory.h" 12 #include "base/memory/ref_counted_memory.h"
13 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "base/string_piece.h" 15 #include "base/string_piece.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "base/time.h" 18 #include "base/time.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/autocomplete/autocomplete_match.h" 20 #include "chrome/browser/autocomplete/autocomplete_match.h"
21 #include "chrome/browser/autocomplete/autocomplete_result.h" 21 #include "chrome/browser/autocomplete/autocomplete_result.h"
22 #include "chrome/browser/browser_about_handler.h" 22 #include "chrome/browser/browser_about_handler.h"
23 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 25 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
26 #include "chrome/browser/ui/webui/options2/autofill_options_handler2.h" 26 #include "chrome/browser/ui/webui/options2/autofill_options_handler.h"
27 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h" 27 #include "chrome/browser/ui/webui/options2/browser_options_handler.h"
28 #include "chrome/browser/ui/webui/options2/clear_browser_data_handler2.h" 28 #include "chrome/browser/ui/webui/options2/clear_browser_data_handler.h"
29 #include "chrome/browser/ui/webui/options2/content_settings_handler2.h" 29 #include "chrome/browser/ui/webui/options2/content_settings_handler.h"
30 #include "chrome/browser/ui/webui/options2/cookies_view_handler2.h" 30 #include "chrome/browser/ui/webui/options2/cookies_view_handler.h"
31 #include "chrome/browser/ui/webui/options2/core_options_handler2.h" 31 #include "chrome/browser/ui/webui/options2/core_options_handler.h"
32 #include "chrome/browser/ui/webui/options2/font_settings_handler2.h" 32 #include "chrome/browser/ui/webui/options2/font_settings_handler.h"
33 #include "chrome/browser/ui/webui/options2/handler_options_handler2.h" 33 #include "chrome/browser/ui/webui/options2/handler_options_handler.h"
34 #include "chrome/browser/ui/webui/options2/home_page_overlay_handler2.h" 34 #include "chrome/browser/ui/webui/options2/home_page_overlay_handler.h"
35 #include "chrome/browser/ui/webui/options2/import_data_handler2.h" 35 #include "chrome/browser/ui/webui/options2/import_data_handler.h"
36 #include "chrome/browser/ui/webui/options2/language_options_handler2.h" 36 #include "chrome/browser/ui/webui/options2/language_options_handler.h"
37 #include "chrome/browser/ui/webui/options2/manage_profile_handler2.h" 37 #include "chrome/browser/ui/webui/options2/manage_profile_handler.h"
38 #include "chrome/browser/ui/webui/options2/media_gallery_handler.h" 38 #include "chrome/browser/ui/webui/options2/media_gallery_handler.h"
39 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h" 39 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h"
40 #include "chrome/browser/ui/webui/options2/password_manager_handler2.h" 40 #include "chrome/browser/ui/webui/options2/password_manager_handler.h"
41 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler2.h" 41 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler.h"
42 #include "chrome/browser/ui/webui/options2/startup_pages_handler2.h" 42 #include "chrome/browser/ui/webui/options2/startup_pages_handler.h"
43 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler2.h" 43 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler.h"
44 #include "chrome/browser/ui/webui/theme_source.h" 44 #include "chrome/browser/ui/webui/theme_source.h"
45 #include "chrome/common/jstemplate_builder.h" 45 #include "chrome/common/jstemplate_builder.h"
46 #include "chrome/common/time_format.h" 46 #include "chrome/common/time_format.h"
47 #include "chrome/common/url_constants.h" 47 #include "chrome/common/url_constants.h"
48 #include "content/public/browser/browser_thread.h" 48 #include "content/public/browser/browser_thread.h"
49 #include "content/public/browser/notification_types.h" 49 #include "content/public/browser/notification_types.h"
50 #include "content/public/browser/render_view_host.h" 50 #include "content/public/browser/render_view_host.h"
51 #include "content/public/browser/web_contents.h" 51 #include "content/public/browser/web_contents.h"
52 #include "content/public/browser/web_contents_delegate.h" 52 #include "content/public/browser/web_contents_delegate.h"
53 #include "content/public/browser/web_ui.h" 53 #include "content/public/browser/web_ui.h"
54 #include "grit/chromium_strings.h" 54 #include "grit/chromium_strings.h"
55 #include "grit/generated_resources.h" 55 #include "grit/generated_resources.h"
56 #include "grit/locale_settings.h" 56 #include "grit/locale_settings.h"
57 #include "grit/options2_resources.h" 57 #include "grit/options2_resources.h"
58 #include "grit/theme_resources.h" 58 #include "grit/theme_resources.h"
59 #include "grit/theme_resources_standard.h" 59 #include "grit/theme_resources_standard.h"
60 #include "net/base/escape.h" 60 #include "net/base/escape.h"
61 #include "ui/base/layout.h" 61 #include "ui/base/layout.h"
62 #include "ui/base/resource/resource_bundle.h" 62 #include "ui/base/resource/resource_bundle.h"
63 63
64 #if defined(OS_CHROMEOS) 64 #if defined(OS_CHROMEOS)
65 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 65 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
66 #include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h" 66 #include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler.h"
67 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h " 67 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler.h"
68 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handl er2.h" 68 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handl er.h"
69 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handle r2.h" 69 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handle r.h"
70 #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handle r2.h" 70 #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handle r.h"
71 #include "chrome/browser/ui/webui/options2/chromeos/display_options_handler.h" 71 #include "chrome/browser/ui/webui/options2/chromeos/display_options_handler.h"
72 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h" 72 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h"
73 #include "chrome/browser/ui/webui/options2/chromeos/keyboard_handler2.h" 73 #include "chrome/browser/ui/webui/options2/chromeos/keyboard_handler.h"
74 #include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h" 74 #include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.h"
75 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h" 75 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler.h"
76 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h" 76 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler.h"
77 #include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h" 77 #include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler.h"
78 #include "chrome/browser/ui/webui/options2/chromeos/pointer_handler2.h" 78 #include "chrome/browser/ui/webui/options2/chromeos/pointer_handler.h"
79 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h" 79 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler.h"
80 #include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h" 80 #include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler.h"
81 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h" 81 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source.h"
82 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2. h" 82 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.h "
83 #endif 83 #endif
84 84
85 #if defined(OS_CHROMEOS) && defined(USE_ASH) 85 #if defined(OS_CHROMEOS) && defined(USE_ASH)
86 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle r2.h" 86 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle r.h"
87 #endif 87 #endif
88 88
89 #if defined(USE_NSS) 89 #if defined(USE_NSS)
90 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h" 90 #include "chrome/browser/ui/webui/options2/certificate_manager_handler.h"
91 #endif 91 #endif
92 92
93 using content::RenderViewHost; 93 using content::RenderViewHost;
94 94
95 namespace { 95 namespace {
96 96
97 const char kLocalizedStringsFile[] = "strings.js"; 97 const char kLocalizedStringsFile[] = "strings.js";
98 const char kOptionsBundleJsFile[] = "options_bundle.js"; 98 const char kOptionsBundleJsFile[] = "options_bundle.js";
99 99
100 } // namespace 100 } // namespace
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 // Add only if handler's service is enabled. 388 // Add only if handler's service is enabled.
389 if (handler->IsEnabled()) { 389 if (handler->IsEnabled()) {
390 // Add handler to the list and also pass the ownership. 390 // Add handler to the list and also pass the ownership.
391 web_ui()->AddMessageHandler(handler.release()); 391 web_ui()->AddMessageHandler(handler.release());
392 handler_raw->GetLocalizedValues(localized_strings); 392 handler_raw->GetLocalizedValues(localized_strings);
393 handlers_.push_back(handler_raw); 393 handlers_.push_back(handler_raw);
394 } 394 }
395 } 395 }
396 396
397 } // namespace options2 397 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/options_ui.h ('k') | chrome/browser/ui/webui/options2/options_ui2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698