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

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

Issue 475483003: Wire easy unlock settings UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/options/easy_unlock_handler.cc ('k') | chrome/chrome_browser.gypi » ('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/options/options_ui.h" 5 #include "chrome/browser/ui/webui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/ui/webui/metrics_handler.h" 24 #include "chrome/browser/ui/webui/metrics_handler.h"
25 #include "chrome/browser/ui/webui/options/autofill_options_handler.h" 25 #include "chrome/browser/ui/webui/options/autofill_options_handler.h"
26 #include "chrome/browser/ui/webui/options/automatic_settings_reset_handler.h" 26 #include "chrome/browser/ui/webui/options/automatic_settings_reset_handler.h"
27 #include "chrome/browser/ui/webui/options/browser_options_handler.h" 27 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
28 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h" 28 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
29 #include "chrome/browser/ui/webui/options/content_settings_handler.h" 29 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
30 #include "chrome/browser/ui/webui/options/cookies_view_handler.h" 30 #include "chrome/browser/ui/webui/options/cookies_view_handler.h"
31 #include "chrome/browser/ui/webui/options/core_options_handler.h" 31 #include "chrome/browser/ui/webui/options/core_options_handler.h"
32 #include "chrome/browser/ui/webui/options/create_profile_handler.h" 32 #include "chrome/browser/ui/webui/options/create_profile_handler.h"
33 #include "chrome/browser/ui/webui/options/easy_unlock_handler.h"
33 #include "chrome/browser/ui/webui/options/font_settings_handler.h" 34 #include "chrome/browser/ui/webui/options/font_settings_handler.h"
34 #include "chrome/browser/ui/webui/options/handler_options_handler.h" 35 #include "chrome/browser/ui/webui/options/handler_options_handler.h"
35 #include "chrome/browser/ui/webui/options/home_page_overlay_handler.h" 36 #include "chrome/browser/ui/webui/options/home_page_overlay_handler.h"
36 #include "chrome/browser/ui/webui/options/import_data_handler.h" 37 #include "chrome/browser/ui/webui/options/import_data_handler.h"
37 #include "chrome/browser/ui/webui/options/language_dictionary_overlay_handler.h" 38 #include "chrome/browser/ui/webui/options/language_dictionary_overlay_handler.h"
38 #include "chrome/browser/ui/webui/options/language_options_handler.h" 39 #include "chrome/browser/ui/webui/options/language_options_handler.h"
39 #include "chrome/browser/ui/webui/options/manage_profile_handler.h" 40 #include "chrome/browser/ui/webui/options/manage_profile_handler.h"
40 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h" 41 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h"
41 #include "chrome/browser/ui/webui/options/password_manager_handler.h" 42 #include "chrome/browser/ui/webui/options/password_manager_handler.h"
42 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h" 43 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 AddOptionsPageUIHandler(localized_strings, 267 AddOptionsPageUIHandler(localized_strings,
267 new AutomaticSettingsResetHandler()); 268 new AutomaticSettingsResetHandler());
268 269
269 BrowserOptionsHandler* browser_options_handler = new BrowserOptionsHandler(); 270 BrowserOptionsHandler* browser_options_handler = new BrowserOptionsHandler();
270 AddOptionsPageUIHandler(localized_strings, browser_options_handler); 271 AddOptionsPageUIHandler(localized_strings, browser_options_handler);
271 272
272 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler()); 273 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
273 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler()); 274 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
274 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler()); 275 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
275 AddOptionsPageUIHandler(localized_strings, new CreateProfileHandler()); 276 AddOptionsPageUIHandler(localized_strings, new CreateProfileHandler());
277 AddOptionsPageUIHandler(localized_strings, new EasyUnlockHandler());
276 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler()); 278 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
277 #if defined(ENABLE_GOOGLE_NOW) 279 #if defined(ENABLE_GOOGLE_NOW)
278 AddOptionsPageUIHandler(localized_strings, new GeolocationOptionsHandler()); 280 AddOptionsPageUIHandler(localized_strings, new GeolocationOptionsHandler());
279 #endif 281 #endif
280 AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler()); 282 AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler());
281 AddOptionsPageUIHandler(localized_strings, 283 AddOptionsPageUIHandler(localized_strings,
282 new MediaDevicesSelectionHandler()); 284 new MediaDevicesSelectionHandler());
283 #if defined(OS_CHROMEOS) 285 #if defined(OS_CHROMEOS)
284 AddOptionsPageUIHandler(localized_strings, 286 AddOptionsPageUIHandler(localized_strings,
285 new chromeos::options::CrosLanguageOptionsHandler()); 287 new chromeos::options::CrosLanguageOptionsHandler());
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 // Add only if handler's service is enabled. 468 // Add only if handler's service is enabled.
467 if (handler->IsEnabled()) { 469 if (handler->IsEnabled()) {
468 // Add handler to the list and also pass the ownership. 470 // Add handler to the list and also pass the ownership.
469 web_ui()->AddMessageHandler(handler.release()); 471 web_ui()->AddMessageHandler(handler.release());
470 handler_raw->GetLocalizedValues(localized_strings); 472 handler_raw->GetLocalizedValues(localized_strings);
471 handlers_.push_back(handler_raw); 473 handlers_.push_back(handler_raw);
472 } 474 }
473 } 475 }
474 476
475 } // namespace options 477 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/easy_unlock_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698