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

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

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 years, 8 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" 90 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
91 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 91 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
92 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" 92 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
93 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" 93 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h"
94 #include "chrome/browser/ui/webui/options/chromeos/power_handler.h" 94 #include "chrome/browser/ui/webui/options/chromeos/power_handler.h"
95 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" 95 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
96 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h" 96 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
97 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 97 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
98 #endif 98 #endif
99 99
100 #if defined(USE_NSS) 100 #if defined(USE_NSS_CERTS)
101 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" 101 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
102 #endif 102 #endif
103 103
104 #if defined(ENABLE_GOOGLE_NOW) 104 #if defined(ENABLE_GOOGLE_NOW)
105 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h" 105 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h"
106 #endif 106 #endif
107 107
108 using content::RenderViewHost; 108 using content::RenderViewHost;
109 109
110 namespace { 110 namespace {
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 AddOptionsPageUIHandler(localized_strings, 340 AddOptionsPageUIHandler(localized_strings,
341 new chromeos::options::StatsOptionsHandler()); 341 new chromeos::options::StatsOptionsHandler());
342 342
343 policy::ConsumerManagementService* consumer_management = 343 policy::ConsumerManagementService* consumer_management =
344 g_browser_process->platform_part()->browser_policy_connector_chromeos()-> 344 g_browser_process->platform_part()->browser_policy_connector_chromeos()->
345 GetConsumerManagementService(); 345 GetConsumerManagementService();
346 chromeos::options::ConsumerManagementHandler* consumer_management_handler = 346 chromeos::options::ConsumerManagementHandler* consumer_management_handler =
347 new chromeos::options::ConsumerManagementHandler(consumer_management); 347 new chromeos::options::ConsumerManagementHandler(consumer_management);
348 AddOptionsPageUIHandler(localized_strings, consumer_management_handler); 348 AddOptionsPageUIHandler(localized_strings, consumer_management_handler);
349 #endif 349 #endif
350 #if defined(USE_NSS) 350 #if defined(USE_NSS_CERTS)
351 AddOptionsPageUIHandler(localized_strings, 351 AddOptionsPageUIHandler(localized_strings,
352 new CertificateManagerHandler(false)); 352 new CertificateManagerHandler(false));
353 #endif 353 #endif
354 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); 354 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler());
355 355
356 web_ui->AddMessageHandler(new MetricsHandler()); 356 web_ui->AddMessageHandler(new MetricsHandler());
357 357
358 // Enable extension API calls in the WebUI. 358 // Enable extension API calls in the WebUI.
359 extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents()); 359 extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents());
360 360
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 // Add only if handler's service is enabled. 478 // Add only if handler's service is enabled.
479 if (handler->IsEnabled()) { 479 if (handler->IsEnabled()) {
480 // Add handler to the list and also pass the ownership. 480 // Add handler to the list and also pass the ownership.
481 web_ui()->AddMessageHandler(handler.release()); 481 web_ui()->AddMessageHandler(handler.release());
482 handler_raw->GetLocalizedValues(localized_strings); 482 handler_raw->GetLocalizedValues(localized_strings);
483 handlers_.push_back(handler_raw); 483 handlers_.push_back(handler_raw);
484 } 484 }
485 } 485 }
486 486
487 } // namespace options 487 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/certificate_manager_browsertest.js ('k') | chrome/common/net/x509_certificate_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698