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

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

Issue 9124028: separate about page into its own page (included in chrome://chrome) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change indent, move script includes to inside body Created 8 years, 11 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) 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/options2/options_ui2.h" 5 #include "chrome/browser/ui/webui/options2/options_ui2.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"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "grit/chromium_strings.h" 49 #include "grit/chromium_strings.h"
50 #include "grit/generated_resources.h" 50 #include "grit/generated_resources.h"
51 #include "grit/locale_settings.h" 51 #include "grit/locale_settings.h"
52 #include "grit/options2_resources.h" 52 #include "grit/options2_resources.h"
53 #include "grit/theme_resources.h" 53 #include "grit/theme_resources.h"
54 #include "grit/theme_resources_standard.h" 54 #include "grit/theme_resources_standard.h"
55 #include "net/base/escape.h" 55 #include "net/base/escape.h"
56 #include "ui/base/resource/resource_bundle.h" 56 #include "ui/base/resource/resource_bundle.h"
57 57
58 #if defined(OS_CHROMEOS) 58 #if defined(OS_CHROMEOS)
59 #include "chrome/browser/ui/webui/options2/chromeos/about_page_handler2.h"
60 #include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h" 59 #include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h"
61 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h " 60 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h "
62 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handl er2.h" 61 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handl er2.h"
63 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handle r2.h" 62 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handle r2.h"
64 #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handle r2.h" 63 #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handle r2.h"
65 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h" 64 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h"
66 #include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h" 65 #include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h"
67 #include "chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_ keys_handler2.h" 66 #include "chrome/browser/ui/webui/options2/chromeos/language_customize_modifier_ keys_handler2.h"
68 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h" 67 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h"
69 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h" 68 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 226 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
228 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 227 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
229 AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler()); 228 AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler());
230 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 229 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
231 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 230 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
232 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler()); 231 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler());
233 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler( 232 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler(
234 g_browser_process->profile_manager())); 233 g_browser_process->profile_manager()));
235 #if defined(OS_CHROMEOS) 234 #if defined(OS_CHROMEOS)
236 AddOptionsPageUIHandler(localized_strings, 235 AddOptionsPageUIHandler(localized_strings,
237 new chromeos::options2::AboutPageHandler());
238 AddOptionsPageUIHandler(localized_strings,
239 new chromeos::options2::AccountsOptionsHandler()); 236 new chromeos::options2::AccountsOptionsHandler());
240 AddOptionsPageUIHandler(localized_strings, 237 AddOptionsPageUIHandler(localized_strings,
241 new chromeos::options2::BluetoothOptionsHandler()); 238 new chromeos::options2::BluetoothOptionsHandler());
242 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler()); 239 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
243 AddOptionsPageUIHandler(localized_strings, 240 AddOptionsPageUIHandler(localized_strings,
244 new chromeos::options2::LanguageChewingHandler()); 241 new chromeos::options2::LanguageChewingHandler());
245 AddOptionsPageUIHandler( 242 AddOptionsPageUIHandler(
246 localized_strings, 243 localized_strings,
247 new chromeos::options2::LanguageCustomizeModifierKeysHandler()); 244 new chromeos::options2::LanguageCustomizeModifierKeysHandler());
248 AddOptionsPageUIHandler(localized_strings, 245 AddOptionsPageUIHandler(localized_strings,
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); 364 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
368 #else 365 #else
369 command_line_string = 366 command_line_string =
370 CommandLine::ForCurrentProcess()->GetCommandLineString(); 367 CommandLine::ForCurrentProcess()->GetCommandLineString();
371 #endif 368 #endif
372 369
373 render_view_host->SetWebUIProperty("commandLineString", command_line_string); 370 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
374 } 371 }
375 372
376 } // namespace options2 373 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/about_page_handler2.cc ('k') | chrome/browser/ui/webui/uber/uber_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698