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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 629463003: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[w-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "apps/saved_files_service.h" 8 #include "apps/saved_files_service.h"
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // This class is designed to broker the message between the two objects, while 130 // This class is designed to broker the message between the two objects, while
131 // managing its own lifetime so that it can outlive the ExtensionSettingsHandler 131 // managing its own lifetime so that it can outlive the ExtensionSettingsHandler
132 // and (when doing so) gracefully ignore the message from the dialog. 132 // and (when doing so) gracefully ignore the message from the dialog.
133 class BrokerDelegate : public ExtensionInstallPrompt::Delegate { 133 class BrokerDelegate : public ExtensionInstallPrompt::Delegate {
134 public: 134 public:
135 explicit BrokerDelegate( 135 explicit BrokerDelegate(
136 const base::WeakPtr<ExtensionSettingsHandler>& delegate) 136 const base::WeakPtr<ExtensionSettingsHandler>& delegate)
137 : delegate_(delegate) {} 137 : delegate_(delegate) {}
138 138
139 // ExtensionInstallPrompt::Delegate implementation. 139 // ExtensionInstallPrompt::Delegate implementation.
140 virtual void InstallUIProceed() OVERRIDE { 140 virtual void InstallUIProceed() override {
141 if (delegate_) 141 if (delegate_)
142 delegate_->InstallUIProceed(); 142 delegate_->InstallUIProceed();
143 delete this; 143 delete this;
144 }; 144 };
145 145
146 virtual void InstallUIAbort(bool user_initiated) OVERRIDE { 146 virtual void InstallUIAbort(bool user_initiated) override {
147 if (delegate_) 147 if (delegate_)
148 delegate_->InstallUIAbort(user_initiated); 148 delegate_->InstallUIAbort(user_initiated);
149 delete this; 149 delete this;
150 }; 150 };
151 151
152 private: 152 private:
153 base::WeakPtr<ExtensionSettingsHandler> delegate_; 153 base::WeakPtr<ExtensionSettingsHandler> delegate_;
154 154
155 DISALLOW_COPY_AND_ASSIGN(BrokerDelegate); 155 DISALLOW_COPY_AND_ASSIGN(BrokerDelegate);
156 }; 156 };
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 extension_service_->EnableExtension(extension_id); 1450 extension_service_->EnableExtension(extension_id);
1451 } else { 1451 } else {
1452 ExtensionErrorReporter::GetInstance()->ReportError( 1452 ExtensionErrorReporter::GetInstance()->ReportError(
1453 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1453 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1454 true); // Be noisy. 1454 true); // Be noisy.
1455 } 1455 }
1456 requirements_checker_.reset(); 1456 requirements_checker_.reset();
1457 } 1457 }
1458 1458
1459 } // namespace extensions 1459 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698