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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index d80bd02ef7f0b228a5b63336badaa45cbe3df411..cd53877ca532c87cd973eaca2903aa552a889d6b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -94,7 +94,7 @@ class TestAppWindowRegistryObserver
}
// Overridden from AppWindowRegistry::Observer:
- virtual void OnAppWindowIconChanged(AppWindow* app_window) OVERRIDE {
+ virtual void OnAppWindowIconChanged(AppWindow* app_window) override {
++icon_updates_;
}
@@ -117,7 +117,7 @@ class LauncherPlatformAppBrowserTest
virtual ~LauncherPlatformAppBrowserTest() {}
- virtual void RunTestOnMainThreadLoop() OVERRIDE {
+ virtual void RunTestOnMainThreadLoop() override {
shelf_ = ash::Shelf::ForPrimaryDisplay();
controller_ = ChromeLauncherController::instance();
return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
@@ -192,7 +192,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {
virtual ~ShelfAppBrowserTest() {}
- virtual void RunTestOnMainThreadLoop() OVERRIDE {
+ virtual void RunTestOnMainThreadLoop() override {
shelf_ = ash::Shelf::ForPrimaryDisplay();
model_ = ash::test::ShellTestApi(ash::Shell::GetInstance()).shelf_model();
controller_ = ChromeLauncherController::instance();
@@ -312,7 +312,7 @@ class ShelfAppBrowserTestNoDefaultBrowser : public ShelfAppBrowserTest {
ShelfAppBrowserTestNoDefaultBrowser() {}
virtual ~ShelfAppBrowserTestNoDefaultBrowser() {}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
ShelfAppBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kNoStartupWindow);
}
@@ -329,7 +329,7 @@ class ShelfAppBrowserNoMinimizeOnClick : public LauncherPlatformAppBrowserTest {
ShelfAppBrowserNoMinimizeOnClick() {}
virtual ~ShelfAppBrowserNoMinimizeOnClick() {}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
LauncherPlatformAppBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(
switches::kDisableMinimizeOnSecondLauncherItemClick);
@@ -1735,7 +1735,7 @@ class ShelfAppBrowserTestWithMultiMonitor
ShelfAppBrowserTestWithMultiMonitor() {}
virtual ~ShelfAppBrowserTestWithMultiMonitor() {}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
ShelfAppBrowserTestNoDefaultBrowser::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII("ash-host-window-bounds",
"800x600,801+0-800x600");

Powered by Google App Engine
This is Rietveld 408576698