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

Side by Side Diff: chrome/browser/apps/ephemeral_app_browsertest.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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/apps/ephemeral_app_browsertest.h" 5 #include "chrome/browser/apps/ephemeral_app_browsertest.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "apps/app_restore_service.h" 9 #include "apps/app_restore_service.h"
10 #include "apps/saved_files_service.h" 10 #include "apps/saved_files_service.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 CHECK(!install_params_.empty()); 111 CHECK(!install_params_.empty());
112 return install_params_.back(); 112 return install_params_.back();
113 } 113 }
114 114
115 private: 115 private:
116 virtual void OnExtensionWillBeInstalled( 116 virtual void OnExtensionWillBeInstalled(
117 content::BrowserContext* browser_context, 117 content::BrowserContext* browser_context,
118 const Extension* extension, 118 const Extension* extension,
119 bool is_update, 119 bool is_update,
120 bool from_ephemeral, 120 bool from_ephemeral,
121 const std::string& old_name) OVERRIDE { 121 const std::string& old_name) override {
122 install_params_.push_back( 122 install_params_.push_back(
123 InstallParameters(extension->id(), is_update, from_ephemeral)); 123 InstallParameters(extension->id(), is_update, from_ephemeral));
124 } 124 }
125 125
126 std::vector<InstallParameters> install_params_; 126 std::vector<InstallParameters> install_params_;
127 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> 127 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
128 registry_observer_; 128 registry_observer_;
129 }; 129 };
130 130
131 // Instead of actually changing the system power settings, tests will just 131 // Instead of actually changing the system power settings, tests will just
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 base::Bind(&PowerSaveBlockerStub::Create, &power_settings)); 1033 base::Bind(&PowerSaveBlockerStub::Create, &power_settings));
1034 1034
1035 const Extension* app = InstallAndLaunchEphemeralApp(kPowerTestApp); 1035 const Extension* app = InstallAndLaunchEphemeralApp(kPowerTestApp);
1036 ASSERT_TRUE(app); 1036 ASSERT_TRUE(app);
1037 EXPECT_EQ(1, power_settings.keep_awake_count()); 1037 EXPECT_EQ(1, power_settings.keep_awake_count());
1038 1038
1039 CloseAppWaitForUnload(app->id()); 1039 CloseAppWaitForUnload(app->id());
1040 1040
1041 EXPECT_EQ(0, power_settings.keep_awake_count()); 1041 EXPECT_EQ(0, power_settings.keep_awake_count());
1042 } 1042 }
OLDNEW
« no previous file with comments | « chrome/browser/apps/ephemeral_app_browsertest.h ('k') | chrome/browser/apps/ephemeral_app_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698