| Index: chrome/browser/ui/window_sizer/window_sizer.cc
|
| diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
|
| index c1ce2739072aa537f1fb0aa05e8eab42a21100a6..77a9eab1bdbf5e5d23a834460ee92b45ea5f9d12 100644
|
| --- a/chrome/browser/ui/window_sizer/window_sizer.cc
|
| +++ b/chrome/browser/ui/window_sizer/window_sizer.cc
|
| @@ -42,10 +42,9 @@ class DefaultStateProvider : public WindowSizer::StateProvider {
|
| }
|
|
|
| // Overridden from WindowSizer::StateProvider:
|
| - virtual bool GetPersistentState(
|
| - gfx::Rect* bounds,
|
| - gfx::Rect* work_area,
|
| - ui::WindowShowState* show_state) const override {
|
| + bool GetPersistentState(gfx::Rect* bounds,
|
| + gfx::Rect* work_area,
|
| + ui::WindowShowState* show_state) const override {
|
| DCHECK(bounds);
|
| DCHECK(show_state);
|
|
|
| @@ -85,7 +84,7 @@ class DefaultStateProvider : public WindowSizer::StateProvider {
|
| return has_prefs;
|
| }
|
|
|
| - virtual bool GetLastActiveWindowState(
|
| + bool GetLastActiveWindowState(
|
| gfx::Rect* bounds,
|
| ui::WindowShowState* show_state) const override {
|
| DCHECK(show_state);
|
| @@ -141,11 +140,10 @@ class DefaultStateProvider : public WindowSizer::StateProvider {
|
| class DefaultTargetDisplayProvider : public WindowSizer::TargetDisplayProvider {
|
| public:
|
| DefaultTargetDisplayProvider() {}
|
| - virtual ~DefaultTargetDisplayProvider() {}
|
| + ~DefaultTargetDisplayProvider() override {}
|
|
|
| - virtual gfx::Display GetTargetDisplay(
|
| - const gfx::Screen* screen,
|
| - const gfx::Rect& bounds) const override {
|
| + gfx::Display GetTargetDisplay(const gfx::Screen* screen,
|
| + const gfx::Rect& bounds) const override {
|
| #if defined(USE_ASH)
|
| bool force_ash = false;
|
| // On Windows check if the browser is launched to serve ASH. If yes then
|
|
|