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

Side by Side Diff: chrome/browser/extensions/crx_installer_browsertest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (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/extensions/crx_installer.h" 5 #include "chrome/browser/extensions/crx_installer.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/download/download_crx_util.h" 10 #include "chrome/browser/download/download_crx_util.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 MockPromptProxy* proxy) : 98 MockPromptProxy* proxy) :
99 ExtensionInstallPrompt(web_contents), 99 ExtensionInstallPrompt(web_contents),
100 proxy_(proxy) {} 100 proxy_(proxy) {}
101 101
102 void set_record_oauth2_grant(bool record) { record_oauth2_grant_ = record; } 102 void set_record_oauth2_grant(bool record) { record_oauth2_grant_ = record; }
103 103
104 // Overriding some of the ExtensionInstallUI API. 104 // Overriding some of the ExtensionInstallUI API.
105 virtual void ConfirmInstall( 105 virtual void ConfirmInstall(
106 Delegate* delegate, 106 Delegate* delegate,
107 const Extension* extension, 107 const Extension* extension,
108 const ShowDialogCallback& show_dialog_callback) OVERRIDE { 108 const ShowDialogCallback& show_dialog_callback) override {
109 proxy_->set_confirmation_requested(); 109 proxy_->set_confirmation_requested();
110 delegate->InstallUIProceed(); 110 delegate->InstallUIProceed();
111 } 111 }
112 virtual void OnInstallSuccess(const Extension* extension, 112 virtual void OnInstallSuccess(const Extension* extension,
113 SkBitmap* icon) OVERRIDE { 113 SkBitmap* icon) override {
114 proxy_->set_extension_id(extension->id()); 114 proxy_->set_extension_id(extension->id());
115 base::MessageLoopForUI::current()->Quit(); 115 base::MessageLoopForUI::current()->Quit();
116 } 116 }
117 virtual void OnInstallFailure(const CrxInstallerError& error) OVERRIDE { 117 virtual void OnInstallFailure(const CrxInstallerError& error) override {
118 proxy_->set_error(error.message()); 118 proxy_->set_error(error.message());
119 base::MessageLoopForUI::current()->Quit(); 119 base::MessageLoopForUI::current()->Quit();
120 } 120 }
121 121
122 private: 122 private:
123 scoped_refptr<MockPromptProxy> proxy_; 123 scoped_refptr<MockPromptProxy> proxy_;
124 }; 124 };
125 125
126 MockPromptProxy::MockPromptProxy(content::WebContents* web_contents) 126 MockPromptProxy::MockPromptProxy(content::WebContents* web_contents)
127 : web_contents_(web_contents), confirmation_requested_(false) { 127 : web_contents_(web_contents), confirmation_requested_(false) {
(...skipping 13 matching lines...) Expand all
141 scoped_refptr<MockPromptProxy> CreateMockPromptProxyForBrowser( 141 scoped_refptr<MockPromptProxy> CreateMockPromptProxyForBrowser(
142 Browser* browser) { 142 Browser* browser) {
143 return new MockPromptProxy( 143 return new MockPromptProxy(
144 browser->tab_strip_model()->GetActiveWebContents()); 144 browser->tab_strip_model()->GetActiveWebContents());
145 } 145 }
146 146
147 class ManagementPolicyMock : public extensions::ManagementPolicy::Provider { 147 class ManagementPolicyMock : public extensions::ManagementPolicy::Provider {
148 public: 148 public:
149 ManagementPolicyMock() {} 149 ManagementPolicyMock() {}
150 150
151 virtual std::string GetDebugPolicyProviderName() const OVERRIDE { 151 virtual std::string GetDebugPolicyProviderName() const override {
152 return "ManagementPolicyMock"; 152 return "ManagementPolicyMock";
153 } 153 }
154 154
155 virtual bool UserMayLoad(const Extension* extension, 155 virtual bool UserMayLoad(const Extension* extension,
156 base::string16* error) const OVERRIDE { 156 base::string16* error) const override {
157 *error = base::UTF8ToUTF16("Dummy error message"); 157 *error = base::UTF8ToUTF16("Dummy error message");
158 return false; 158 return false;
159 } 159 }
160 }; 160 };
161 161
162 } // namespace 162 } // namespace
163 163
164 class ExtensionCrxInstallerTest : public ExtensionBrowserTest { 164 class ExtensionCrxInstallerTest : public ExtensionBrowserTest {
165 public: 165 public:
166 scoped_ptr<WebstoreInstaller::Approval> GetApproval( 166 scoped_ptr<WebstoreInstaller::Approval> GetApproval(
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 // because previously withheld permissions are now being requested. 595 // because previously withheld permissions are now being requested.
596 enable_scripts_switch.reset(); 596 enable_scripts_switch.reset();
597 extension = InstallExtension(crx_path, -1); 597 extension = InstallExtension(crx_path, -1);
598 EXPECT_FALSE(registry->enabled_extensions().GetByID(extension_id)); 598 EXPECT_FALSE(registry->enabled_extensions().GetByID(extension_id));
599 EXPECT_TRUE(registry->disabled_extensions().GetByID(extension_id)); 599 EXPECT_TRUE(registry->disabled_extensions().GetByID(extension_id));
600 EXPECT_TRUE(ExtensionPrefs::Get(browser()->profile())->GetDisableReasons( 600 EXPECT_TRUE(ExtensionPrefs::Get(browser()->profile())->GetDisableReasons(
601 extension_id) & Extension::DISABLE_PERMISSIONS_INCREASE); 601 extension_id) & Extension::DISABLE_PERMISSIONS_INCREASE);
602 } 602 }
603 603
604 } // namespace extensions 604 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/crx_installer.h ('k') | chrome/browser/extensions/declarative_user_script_master.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698