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

Unified Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
index 9b31966fd5a5cb97529a4eac508f3bd94746ec21..16999e3712be595a3e28f85f76f513c199c65d7c 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
@@ -126,7 +126,7 @@ class AppDataLoadWaiter : public KioskAppManagerObserver {
private:
// KioskAppManagerObserver overrides:
- virtual void OnKioskAppDataChanged(const std::string& app_id) OVERRIDE {
+ virtual void OnKioskAppDataChanged(const std::string& app_id) override {
++data_change_count_;
if (data_change_count_ < data_loaded_threshold_)
return;
@@ -136,7 +136,7 @@ class AppDataLoadWaiter : public KioskAppManagerObserver {
runner_->Quit();
}
- virtual void OnKioskAppDataLoadFailure(const std::string& app_id) OVERRIDE {
+ virtual void OnKioskAppDataLoadFailure(const std::string& app_id) override {
loaded_ = false;
quit_ = true;
if (runner_.get())
@@ -144,12 +144,12 @@ class AppDataLoadWaiter : public KioskAppManagerObserver {
}
virtual void OnKioskExtensionLoadedInCache(
- const std::string& app_id) OVERRIDE {
+ const std::string& app_id) override {
OnKioskAppDataChanged(app_id);
}
virtual void OnKioskExtensionDownloadFailed(
- const std::string& app_id) OVERRIDE {
+ const std::string& app_id) override {
OnKioskAppDataLoadFailure(app_id);
}
@@ -171,7 +171,7 @@ class KioskAppManagerTest : public InProcessBrowserTest {
virtual ~KioskAppManagerTest() {}
// InProcessBrowserTest overrides:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
base::FilePath test_data_dir;
PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
@@ -185,21 +185,21 @@ class KioskAppManagerTest : public InProcessBrowserTest {
InProcessBrowserTest::SetUp();
}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
InProcessBrowserTest::SetUpCommandLine(command_line);
// Initialize fake_cws_ to setup web store gallery.
fake_cws_->Init(embedded_test_server());
}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
InProcessBrowserTest::SetUpOnMainThread();
// Restart the thread as the sandbox host process has already been spawned.
embedded_test_server()->RestartThreadAndListen();
}
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpInProcessBrowserTestFixture() override {
InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
host_resolver()->AddRule("*", "127.0.0.1");
« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_app_manager.h ('k') | chrome/browser/chromeos/app_mode/kiosk_app_update_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698