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

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

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_browsertest.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 InstallExtension(extensions_data_dir.AppendASCII("good.crx")); 56 InstallExtension(extensions_data_dir.AppendASCII("good.crx"));
57 } 57 }
58 58
59 class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt { 59 class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt {
60 public: 60 public:
61 explicit MockAutoConfirmExtensionInstallPrompt( 61 explicit MockAutoConfirmExtensionInstallPrompt(
62 content::WebContents* web_contents) 62 content::WebContents* web_contents)
63 : ExtensionInstallPrompt(web_contents) {} 63 : ExtensionInstallPrompt(web_contents) {}
64 64
65 // Proceed without confirmation prompt. 65 // Proceed without confirmation prompt.
66 virtual void ConfirmInstall( 66 void ConfirmInstall(Delegate* delegate,
67 Delegate* delegate, 67 const Extension* extension,
68 const Extension* extension, 68 const ShowDialogCallback& show_dialog_callback) override {
69 const ShowDialogCallback& show_dialog_callback) override {
70 delegate->InstallUIProceed(); 69 delegate->InstallUIProceed();
71 } 70 }
72 }; 71 };
73 72
74 const Extension* ExtensionSettingsUIBrowserTest::InstallExtension( 73 const Extension* ExtensionSettingsUIBrowserTest::InstallExtension(
75 const base::FilePath& path) { 74 const base::FilePath& path) {
76 Profile* profile = this->GetProfile(); 75 Profile* profile = this->GetProfile();
77 ExtensionService* service = 76 ExtensionService* service =
78 extensions::ExtensionSystem::Get(profile)->extension_service(); 77 extensions::ExtensionSystem::Get(profile)->extension_service();
79 service->set_show_extensions_prompts(false); 78 service->set_show_extensions_prompts(false);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 iter != errors->end(); ++iter) 123 iter != errors->end(); ++iter)
125 VLOG(1) << *iter; 124 VLOG(1) << *iter;
126 125
127 return NULL; 126 return NULL;
128 } 127 }
129 128
130 if (!observer_->WaitForExtensionViewsToLoad()) 129 if (!observer_->WaitForExtensionViewsToLoad())
131 return NULL; 130 return NULL;
132 return service->GetExtensionById(last_loaded_extension_id(), false); 131 return service->GetExtensionById(last_loaded_extension_id(), false);
133 } 132 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698