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

Side by Side Diff: chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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 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/views/extensions/extension_install_dialog_view.h" 5 #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/extensions/extension_browsertest.h" 8 #include "chrome/browser/extensions/extension_browsertest.h"
9 #include "chrome/browser/extensions/extension_icon_manager.h" 9 #include "chrome/browser/extensions/extension_icon_manager.h"
10 #include "chrome/browser/extensions/extension_install_prompt.h" 10 #include "chrome/browser/extensions/extension_install_prompt.h"
(...skipping 15 matching lines...) Expand all
26 // A simple delegate implementation that counts the number of times 26 // A simple delegate implementation that counts the number of times
27 // |InstallUIProceed| and |InstallUIAbort| are called. 27 // |InstallUIProceed| and |InstallUIAbort| are called.
28 class MockExtensionInstallPromptDelegate 28 class MockExtensionInstallPromptDelegate
29 : public ExtensionInstallPrompt::Delegate { 29 : public ExtensionInstallPrompt::Delegate {
30 public: 30 public:
31 MockExtensionInstallPromptDelegate() 31 MockExtensionInstallPromptDelegate()
32 : proceed_count_(0), 32 : proceed_count_(0),
33 abort_count_(0) {} 33 abort_count_(0) {}
34 34
35 // ExtensionInstallPrompt::Delegate overrides. 35 // ExtensionInstallPrompt::Delegate overrides.
36 virtual void InstallUIProceed() OVERRIDE; 36 virtual void InstallUIProceed() override;
37 virtual void InstallUIAbort(bool user_initiated) OVERRIDE; 37 virtual void InstallUIAbort(bool user_initiated) override;
38 38
39 int proceed_count() { return proceed_count_; } 39 int proceed_count() { return proceed_count_; }
40 int abort_count() { return abort_count_; } 40 int abort_count() { return abort_count_; }
41 41
42 protected: 42 protected:
43 int proceed_count_; 43 int proceed_count_;
44 int abort_count_; 44 int abort_count_;
45 }; 45 };
46 46
47 void MockExtensionInstallPromptDelegate::InstallUIProceed() { 47 void MockExtensionInstallPromptDelegate::InstallUIProceed() {
(...skipping 21 matching lines...) Expand all
69 private: 69 private:
70 ExtensionInstallPrompt::Prompt* prompt_; 70 ExtensionInstallPrompt::Prompt* prompt_;
71 }; 71 };
72 72
73 class ExtensionInstallDialogViewTestBase : public ExtensionBrowserTest { 73 class ExtensionInstallDialogViewTestBase : public ExtensionBrowserTest {
74 protected: 74 protected:
75 explicit ExtensionInstallDialogViewTestBase( 75 explicit ExtensionInstallDialogViewTestBase(
76 ExtensionInstallPrompt::PromptType prompt_type); 76 ExtensionInstallPrompt::PromptType prompt_type);
77 virtual ~ExtensionInstallDialogViewTestBase() {} 77 virtual ~ExtensionInstallDialogViewTestBase() {}
78 78
79 virtual void SetUpOnMainThread() OVERRIDE; 79 virtual void SetUpOnMainThread() override;
80 80
81 ExtensionInstallPrompt::Prompt* prompt() { return prompt_.get(); } 81 ExtensionInstallPrompt::Prompt* prompt() { return prompt_.get(); }
82 content::WebContents* web_contents() { return web_contents_; } 82 content::WebContents* web_contents() { return web_contents_; }
83 MockExtensionInstallPromptDelegate* delegate() { return &delegate_; } 83 MockExtensionInstallPromptDelegate* delegate() { return &delegate_; }
84 84
85 void SetPromptPermissions(std::vector<base::string16> permissions); 85 void SetPromptPermissions(std::vector<base::string16> permissions);
86 void SetPromptDetails(std::vector<base::string16> details); 86 void SetPromptDetails(std::vector<base::string16> details);
87 void SetPromptRetainedFiles(std::vector<base::FilePath> files); 87 void SetPromptRetainedFiles(std::vector<base::FilePath> files);
88 88
89 private: 89 private:
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 // proceed or cancel. 254 // proceed or cancel.
255 MockExtensionInstallPromptDelegate delegate; 255 MockExtensionInstallPromptDelegate delegate;
256 scoped_ptr<ExtensionInstallDialogView> dialog( 256 scoped_ptr<ExtensionInstallDialogView> dialog(
257 new ExtensionInstallDialogView(web_contents(), &delegate, prompt())); 257 new ExtensionInstallDialogView(web_contents(), &delegate, prompt()));
258 dialog.reset(); 258 dialog.reset();
259 259
260 EXPECT_EQ(1, delegate.abort_count()); 260 EXPECT_EQ(1, delegate.abort_count());
261 EXPECT_EQ(0, delegate.proceed_count()); 261 EXPECT_EQ(0, delegate.proceed_count());
262 } 262 }
263 } 263 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698