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

Side by Side Diff: chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

Issue 854063002: Update {virtual,override,final} to follow C++11 style chrome/browser/ui/webui/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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/chromeos/proxy_settings_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
6 6
7 #include "base/memory/ref_counted_memory.h" 7 #include "base/memory/ref_counted_memory.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/system/input_device_settings.h" 10 #include "chrome/browser/chromeos/system/input_device_settings.h"
(...skipping 15 matching lines...) Expand all
26 using content::WebContents; 26 using content::WebContents;
27 using content::WebUIMessageHandler; 27 using content::WebUIMessageHandler;
28 28
29 namespace { 29 namespace {
30 30
31 class ProxySettingsHTMLSource : public content::URLDataSource { 31 class ProxySettingsHTMLSource : public content::URLDataSource {
32 public: 32 public:
33 explicit ProxySettingsHTMLSource(base::DictionaryValue* localized_strings); 33 explicit ProxySettingsHTMLSource(base::DictionaryValue* localized_strings);
34 34
35 // content::URLDataSource implementation. 35 // content::URLDataSource implementation.
36 virtual std::string GetSource() const override; 36 std::string GetSource() const override;
37 virtual void StartDataRequest( 37 void StartDataRequest(
38 const std::string& path, 38 const std::string& path,
39 int render_process_id, 39 int render_process_id,
40 int render_frame_id, 40 int render_frame_id,
41 const content::URLDataSource::GotDataCallback& callback) override; 41 const content::URLDataSource::GotDataCallback& callback) override;
42 virtual std::string GetMimeType(const std::string&) const override { 42 std::string GetMimeType(const std::string&) const override {
43 return "text/html"; 43 return "text/html";
44 } 44 }
45 virtual bool ShouldAddContentSecurityPolicy() const override { 45 bool ShouldAddContentSecurityPolicy() const override { return false; }
46 return false;
47 }
48 46
49 protected: 47 protected:
50 virtual ~ProxySettingsHTMLSource() {} 48 ~ProxySettingsHTMLSource() override {}
51 49
52 private: 50 private:
53 scoped_ptr<base::DictionaryValue> localized_strings_; 51 scoped_ptr<base::DictionaryValue> localized_strings_;
54 52
55 DISALLOW_COPY_AND_ASSIGN(ProxySettingsHTMLSource); 53 DISALLOW_COPY_AND_ASSIGN(ProxySettingsHTMLSource);
56 }; 54 };
57 55
58 ProxySettingsHTMLSource::ProxySettingsHTMLSource( 56 ProxySettingsHTMLSource::ProxySettingsHTMLSource(
59 base::DictionaryValue* localized_strings) 57 base::DictionaryValue* localized_strings)
60 : localized_strings_(localized_strings) { 58 : localized_strings_(localized_strings) {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 if (!initialized_handlers_) { 122 if (!initialized_handlers_) {
125 core_handler_->InitializeHandler(); 123 core_handler_->InitializeHandler();
126 proxy_handler_->InitializeHandler(); 124 proxy_handler_->InitializeHandler();
127 initialized_handlers_ = true; 125 initialized_handlers_ = true;
128 } 126 }
129 core_handler_->InitializePage(); 127 core_handler_->InitializePage();
130 proxy_handler_->InitializePage(); 128 proxy_handler_->InitializePage();
131 } 129 }
132 130
133 } // namespace chromeos 131 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/proxy_settings_ui.h ('k') | chrome/browser/ui/webui/chromeos/salsa_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698