OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/chromeos/certificate_manager_dialog_ui.h" | 5 #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h" |
6 | 6 |
| 7 #include <memory> |
| 8 |
7 #include "base/macros.h" | 9 #include "base/macros.h" |
8 #include "base/memory/ref_counted_memory.h" | 10 #include "base/memory/ref_counted_memory.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "base/values.h" | 11 #include "base/values.h" |
11 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/chromeos/system/input_device_settings.h" | 13 #include "chrome/browser/chromeos/system/input_device_settings.h" |
13 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" | 15 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" |
15 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler
.h" | 16 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler
.h" |
16 #include "chrome/common/chrome_constants.h" | 17 #include "chrome/common/chrome_constants.h" |
17 #include "chrome/common/url_constants.h" | 18 #include "chrome/common/url_constants.h" |
18 #include "chromeos/chromeos_constants.h" | 19 #include "chromeos/chromeos_constants.h" |
19 #include "content/public/browser/url_data_source.h" | 20 #include "content/public/browser/url_data_source.h" |
(...skipping 26 matching lines...) Expand all Loading... |
46 const content::URLDataSource::GotDataCallback& callback) override; | 47 const content::URLDataSource::GotDataCallback& callback) override; |
47 std::string GetMimeType(const std::string&) const override { | 48 std::string GetMimeType(const std::string&) const override { |
48 return "text/html"; | 49 return "text/html"; |
49 } | 50 } |
50 bool ShouldAddContentSecurityPolicy() const override { return false; } | 51 bool ShouldAddContentSecurityPolicy() const override { return false; } |
51 | 52 |
52 protected: | 53 protected: |
53 ~CertificateManagerDialogHTMLSource() override {} | 54 ~CertificateManagerDialogHTMLSource() override {} |
54 | 55 |
55 private: | 56 private: |
56 scoped_ptr<base::DictionaryValue> localized_strings_; | 57 std::unique_ptr<base::DictionaryValue> localized_strings_; |
57 | 58 |
58 DISALLOW_COPY_AND_ASSIGN(CertificateManagerDialogHTMLSource); | 59 DISALLOW_COPY_AND_ASSIGN(CertificateManagerDialogHTMLSource); |
59 }; | 60 }; |
60 | 61 |
61 CertificateManagerDialogHTMLSource::CertificateManagerDialogHTMLSource( | 62 CertificateManagerDialogHTMLSource::CertificateManagerDialogHTMLSource( |
62 base::DictionaryValue* localized_strings) | 63 base::DictionaryValue* localized_strings) |
63 : localized_strings_(localized_strings) { | 64 : localized_strings_(localized_strings) { |
64 } | 65 } |
65 | 66 |
66 std::string CertificateManagerDialogHTMLSource::GetSource() const { | 67 std::string CertificateManagerDialogHTMLSource::GetSource() const { |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 if (!initialized_handlers_) { | 135 if (!initialized_handlers_) { |
135 core_handler_->InitializeHandler(); | 136 core_handler_->InitializeHandler(); |
136 cert_handler_->InitializeHandler(); | 137 cert_handler_->InitializeHandler(); |
137 initialized_handlers_ = true; | 138 initialized_handlers_ = true; |
138 } | 139 } |
139 core_handler_->InitializePage(); | 140 core_handler_->InitializePage(); |
140 cert_handler_->InitializePage(); | 141 cert_handler_->InitializePage(); |
141 } | 142 } |
142 | 143 |
143 } // namespace chromeos | 144 } // namespace chromeos |
OLD | NEW |