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

Side by Side Diff: chrome/browser/dom_ui/options/options_ui.cc

Issue 5315006: chromeos: Fix DOMUI about:credits link. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: abstract out AboutSource init code from WillHandleBrowserAboutURL Created 9 years, 12 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/dom_ui/options/options_ui.h" 5 #include "chrome/browser/dom_ui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/singleton.h" 14 #include "base/singleton.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/thread.h" 17 #include "base/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/browser_about_handler.h"
20 #include "chrome/browser/browser_thread.h" 21 #include "chrome/browser/browser_thread.h"
21 #include "chrome/browser/dom_ui/dom_ui_theme_source.h" 22 #include "chrome/browser/dom_ui/dom_ui_theme_source.h"
22 #include "chrome/browser/dom_ui/options/about_page_handler.h" 23 #include "chrome/browser/dom_ui/options/about_page_handler.h"
23 #include "chrome/browser/dom_ui/options/add_startup_page_handler.h" 24 #include "chrome/browser/dom_ui/options/add_startup_page_handler.h"
24 #include "chrome/browser/dom_ui/options/advanced_options_handler.h" 25 #include "chrome/browser/dom_ui/options/advanced_options_handler.h"
25 #include "chrome/browser/dom_ui/options/autofill_options_handler.h" 26 #include "chrome/browser/dom_ui/options/autofill_options_handler.h"
26 #include "chrome/browser/dom_ui/options/browser_options_handler.h" 27 #include "chrome/browser/dom_ui/options/browser_options_handler.h"
27 #include "chrome/browser/dom_ui/options/clear_browser_data_handler.h" 28 #include "chrome/browser/dom_ui/options/clear_browser_data_handler.h"
28 #include "chrome/browser/dom_ui/options/content_settings_handler.h" 29 #include "chrome/browser/dom_ui/options/content_settings_handler.h"
29 #include "chrome/browser/dom_ui/options/cookies_view_handler.h" 30 #include "chrome/browser/dom_ui/options/cookies_view_handler.h"
30 #include "chrome/browser/dom_ui/options/core_options_handler.h" 31 #include "chrome/browser/dom_ui/options/core_options_handler.h"
31 #include "chrome/browser/dom_ui/options/font_settings_handler.h" 32 #include "chrome/browser/dom_ui/options/font_settings_handler.h"
32 #include "chrome/browser/dom_ui/options/import_data_handler.h" 33 #include "chrome/browser/dom_ui/options/import_data_handler.h"
33 #include "chrome/browser/dom_ui/options/password_manager_handler.h" 34 #include "chrome/browser/dom_ui/options/password_manager_handler.h"
34 #include "chrome/browser/dom_ui/options/personal_options_handler.h" 35 #include "chrome/browser/dom_ui/options/personal_options_handler.h"
35 #include "chrome/browser/dom_ui/options/search_engine_manager_handler.h" 36 #include "chrome/browser/dom_ui/options/search_engine_manager_handler.h"
36 #include "chrome/browser/dom_ui/options/startup_page_manager_handler.h" 37 #include "chrome/browser/dom_ui/options/startup_page_manager_handler.h"
37 #include "chrome/browser/dom_ui/options/stop_syncing_handler.h" 38 #include "chrome/browser/dom_ui/options/stop_syncing_handler.h"
38 #include "chrome/browser/dom_ui/options/sync_options_handler.h" 39 #include "chrome/browser/dom_ui/options/sync_options_handler.h"
39 #include "chrome/browser/metrics/user_metrics.h" 40 #include "chrome/browser/metrics/user_metrics.h"
40 #include "chrome/browser/renderer_host/render_view_host.h" 41 #include "chrome/browser/renderer_host/render_view_host.h"
41 #include "chrome/browser/prefs/pref_service.h" 42 #include "chrome/browser/prefs/pref_service.h"
42 #include "chrome/browser/profiles/profile.h" 43 #include "chrome/browser/profiles/profile.h"
43 #include "chrome/browser/tab_contents/tab_contents.h" 44 #include "chrome/browser/tab_contents/tab_contents.h"
44 #include "chrome/browser/tab_contents/tab_contents_delegate.h" 45 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
45 #include "chrome/common/jstemplate_builder.h" 46 #include "chrome/common/jstemplate_builder.h"
46 #include "chrome/common/notification_type.h" 47 #include "chrome/common/notification_type.h"
47 #include "chrome/common/time_format.h" 48 #include "chrome/common/time_format.h"
48 #include "chrome/common/url_constants.h" 49 #include "chrome/common/url_constants.h"
49 #include "net/base/escape.h"
50
51 #include "grit/browser_resources.h" 50 #include "grit/browser_resources.h"
52 #include "grit/chromium_strings.h" 51 #include "grit/chromium_strings.h"
53 #include "grit/generated_resources.h" 52 #include "grit/generated_resources.h"
54 #include "grit/locale_settings.h" 53 #include "grit/locale_settings.h"
55 #include "grit/theme_resources.h" 54 #include "grit/theme_resources.h"
55 #include "net/base/escape.h"
56 56
57 #if defined(OS_CHROMEOS) 57 #if defined(OS_CHROMEOS)
58 #include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h" 58 #include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h"
59 #include "chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h" 59 #include "chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h"
60 #include "chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h" 60 #include "chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h"
61 #include "chrome/browser/chromeos/dom_ui/internet_options_handler.h" 61 #include "chrome/browser/chromeos/dom_ui/internet_options_handler.h"
62 #include "chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h" 62 #include "chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h"
63 #include "chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handle r.h" 63 #include "chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handle r.h"
64 #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h" 64 #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h"
65 #include "chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h" 65 #include "chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 new OptionsUIHTMLSource(localized_strings); 195 new OptionsUIHTMLSource(localized_strings);
196 196
197 // Set up the chrome://settings/ source. 197 // Set up the chrome://settings/ source.
198 BrowserThread::PostTask( 198 BrowserThread::PostTask(
199 BrowserThread::IO, FROM_HERE, 199 BrowserThread::IO, FROM_HERE,
200 NewRunnableMethod( 200 NewRunnableMethod(
201 ChromeURLDataManager::GetInstance(), 201 ChromeURLDataManager::GetInstance(),
202 &ChromeURLDataManager::AddDataSource, 202 &ChromeURLDataManager::AddDataSource,
203 make_scoped_refptr(html_source))); 203 make_scoped_refptr(html_source)));
204 204
205 // Set up chrome://theme/ source. 205 // Set up the chrome://theme/ source.
206 DOMUIThemeSource* theme = new DOMUIThemeSource(GetProfile()); 206 DOMUIThemeSource* theme = new DOMUIThemeSource(GetProfile());
207 BrowserThread::PostTask( 207 BrowserThread::PostTask(
208 BrowserThread::IO, FROM_HERE, 208 BrowserThread::IO, FROM_HERE,
209 NewRunnableMethod( 209 NewRunnableMethod(
210 ChromeURLDataManager::GetInstance(), 210 ChromeURLDataManager::GetInstance(),
211 &ChromeURLDataManager::AddDataSource, 211 &ChromeURLDataManager::AddDataSource,
212 make_scoped_refptr(theme))); 212 make_scoped_refptr(theme)));
213
214 // Initialize the chrome://about/ source in case the user clicks the credits
215 // link.
216 InitializeAboutDataSource();
213 } 217 }
214 218
215 OptionsUI::~OptionsUI() { 219 OptionsUI::~OptionsUI() {
216 // Uninitialize all registered handlers. The base class owns them and it will 220 // Uninitialize all registered handlers. The base class owns them and it will
217 // eventually delete them. 221 // eventually delete them.
218 for (std::vector<DOMMessageHandler*>::iterator iter = handlers_.begin(); 222 for (std::vector<DOMMessageHandler*>::iterator iter = handlers_.begin();
219 iter != handlers_.end(); 223 iter != handlers_.end();
220 ++iter) { 224 ++iter) {
221 static_cast<OptionsPageUIHandler*>(*iter)->Uninitialize(); 225 static_cast<OptionsPageUIHandler*>(*iter)->Uninitialize();
222 } 226 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 OptionsPageUIHandler* handler_raw) { 272 OptionsPageUIHandler* handler_raw) {
269 scoped_ptr<OptionsPageUIHandler> handler(handler_raw); 273 scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
270 DCHECK(handler.get()); 274 DCHECK(handler.get());
271 // Add only if handler's service is enabled. 275 // Add only if handler's service is enabled.
272 if (handler->IsEnabled()) { 276 if (handler->IsEnabled()) {
273 handler->GetLocalizedValues(localized_strings); 277 handler->GetLocalizedValues(localized_strings);
274 // Add handler to the list and also pass the ownership. 278 // Add handler to the list and also pass the ownership.
275 AddMessageHandler(handler.release()->Attach(this)); 279 AddMessageHandler(handler.release()->Attach(this));
276 } 280 }
277 } 281 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options/about_page_handler.cc ('k') | chrome/browser/resources/options/about_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698