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

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

Issue 1156983002: Remove unused "Website Settings" view of content settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
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 28 matching lines...) Expand all
39 #include "chrome/browser/ui/webui/options/import_data_handler.h" 39 #include "chrome/browser/ui/webui/options/import_data_handler.h"
40 #include "chrome/browser/ui/webui/options/language_dictionary_overlay_handler.h" 40 #include "chrome/browser/ui/webui/options/language_dictionary_overlay_handler.h"
41 #include "chrome/browser/ui/webui/options/language_options_handler.h" 41 #include "chrome/browser/ui/webui/options/language_options_handler.h"
42 #include "chrome/browser/ui/webui/options/manage_profile_handler.h" 42 #include "chrome/browser/ui/webui/options/manage_profile_handler.h"
43 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h" 43 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h"
44 #include "chrome/browser/ui/webui/options/password_manager_handler.h" 44 #include "chrome/browser/ui/webui/options/password_manager_handler.h"
45 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h" 45 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h"
46 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" 46 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
47 #include "chrome/browser/ui/webui/options/startup_pages_handler.h" 47 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
48 #include "chrome/browser/ui/webui/options/sync_setup_handler.h" 48 #include "chrome/browser/ui/webui/options/sync_setup_handler.h"
49 #include "chrome/browser/ui/webui/options/website_settings_handler.h"
50 #include "chrome/browser/ui/webui/theme_source.h" 49 #include "chrome/browser/ui/webui/theme_source.h"
51 #include "chrome/common/url_constants.h" 50 #include "chrome/common/url_constants.h"
52 #include "chrome/grit/generated_resources.h" 51 #include "chrome/grit/generated_resources.h"
53 #include "chrome/grit/locale_settings.h" 52 #include "chrome/grit/locale_settings.h"
54 #include "components/omnibox/autocomplete_match.h" 53 #include "components/omnibox/autocomplete_match.h"
55 #include "components/omnibox/autocomplete_result.h" 54 #include "components/omnibox/autocomplete_result.h"
56 #include "content/public/browser/notification_types.h" 55 #include "content/public/browser/notification_types.h"
57 #include "content/public/browser/render_frame_host.h" 56 #include "content/public/browser/render_frame_host.h"
58 #include "content/public/browser/url_data_source.h" 57 #include "content/public/browser/url_data_source.h"
59 #include "content/public/browser/web_contents.h" 58 #include "content/public/browser/web_contents.h"
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 301 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
303 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); 302 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
304 #if defined(ENABLE_SUPERVISED_USERS) 303 #if defined(ENABLE_SUPERVISED_USERS)
305 AddOptionsPageUIHandler(localized_strings, 304 AddOptionsPageUIHandler(localized_strings,
306 new SupervisedUserCreateConfirmHandler()); 305 new SupervisedUserCreateConfirmHandler());
307 AddOptionsPageUIHandler(localized_strings, new SupervisedUserImportHandler()); 306 AddOptionsPageUIHandler(localized_strings, new SupervisedUserImportHandler());
308 AddOptionsPageUIHandler(localized_strings, 307 AddOptionsPageUIHandler(localized_strings,
309 new SupervisedUserLearnMoreHandler()); 308 new SupervisedUserLearnMoreHandler());
310 #endif 309 #endif
311 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler()); 310 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler());
312 AddOptionsPageUIHandler(localized_strings, new WebsiteSettingsHandler());
313 #if defined(OS_CHROMEOS) 311 #if defined(OS_CHROMEOS)
314 AddOptionsPageUIHandler(localized_strings, 312 AddOptionsPageUIHandler(localized_strings,
315 new chromeos::options::AccountsOptionsHandler()); 313 new chromeos::options::AccountsOptionsHandler());
316 AddOptionsPageUIHandler(localized_strings, 314 AddOptionsPageUIHandler(localized_strings,
317 new chromeos::options::BluetoothOptionsHandler()); 315 new chromeos::options::BluetoothOptionsHandler());
318 AddOptionsPageUIHandler(localized_strings, 316 AddOptionsPageUIHandler(localized_strings,
319 new chromeos::options::DateTimeOptionsHandler()); 317 new chromeos::options::DateTimeOptionsHandler());
320 AddOptionsPageUIHandler(localized_strings, 318 AddOptionsPageUIHandler(localized_strings,
321 new chromeos::options::DisplayOptionsHandler()); 319 new chromeos::options::DisplayOptionsHandler());
322 AddOptionsPageUIHandler(localized_strings, 320 AddOptionsPageUIHandler(localized_strings,
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 // Add only if handler's service is enabled. 476 // Add only if handler's service is enabled.
479 if (handler->IsEnabled()) { 477 if (handler->IsEnabled()) {
480 // Add handler to the list and also pass the ownership. 478 // Add handler to the list and also pass the ownership.
481 web_ui()->AddMessageHandler(handler.release()); 479 web_ui()->AddMessageHandler(handler.release());
482 handler_raw->GetLocalizedValues(localized_strings); 480 handler_raw->GetLocalizedValues(localized_strings);
483 handlers_.push_back(handler_raw); 481 handlers_.push_back(handler_raw);
484 } 482 }
485 } 483 }
486 484
487 } // namespace options 485 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698