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

Side by Side Diff: ash/shell.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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
« no previous file with comments | « ash/shell.h ('k') | ash/shell/app_list.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/accelerator_controller.h" 10 #include "ash/accelerators/accelerator_controller.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 // so we can pick up our extended animations. See ash/wm/window_animations.h. 153 // so we can pick up our extended animations. See ash/wm/window_animations.h.
154 class AshVisibilityController : public ::wm::VisibilityController { 154 class AshVisibilityController : public ::wm::VisibilityController {
155 public: 155 public:
156 AshVisibilityController() {} 156 AshVisibilityController() {}
157 virtual ~AshVisibilityController() {} 157 virtual ~AshVisibilityController() {}
158 158
159 private: 159 private:
160 // Overridden from ::wm::VisibilityController: 160 // Overridden from ::wm::VisibilityController:
161 virtual bool CallAnimateOnChildWindowVisibilityChanged( 161 virtual bool CallAnimateOnChildWindowVisibilityChanged(
162 aura::Window* window, 162 aura::Window* window,
163 bool visible) OVERRIDE { 163 bool visible) override {
164 return AnimateOnChildWindowVisibilityChanged(window, visible); 164 return AnimateOnChildWindowVisibilityChanged(window, visible);
165 } 165 }
166 166
167 DISALLOW_COPY_AND_ASSIGN(AshVisibilityController); 167 DISALLOW_COPY_AND_ASSIGN(AshVisibilityController);
168 }; 168 };
169 169
170 AshWindowTreeHostInitParams ShellInitParamsToAshWindowTreeHostInitParams( 170 AshWindowTreeHostInitParams ShellInitParamsToAshWindowTreeHostInitParams(
171 const ShellInitParams& shell_init_params) { 171 const ShellInitParams& shell_init_params) {
172 AshWindowTreeHostInitParams ash_init_params; 172 AshWindowTreeHostInitParams ash_init_params;
173 #if defined(OS_WIN) 173 #if defined(OS_WIN)
(...skipping 979 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 //////////////////////////////////////////////////////////////////////////////// 1153 ////////////////////////////////////////////////////////////////////////////////
1154 // Shell, aura::client::ActivationChangeObserver implementation: 1154 // Shell, aura::client::ActivationChangeObserver implementation:
1155 1155
1156 void Shell::OnWindowActivated(aura::Window* gained_active, 1156 void Shell::OnWindowActivated(aura::Window* gained_active,
1157 aura::Window* lost_active) { 1157 aura::Window* lost_active) {
1158 if (gained_active) 1158 if (gained_active)
1159 target_root_window_ = gained_active->GetRootWindow(); 1159 target_root_window_ = gained_active->GetRootWindow();
1160 } 1160 }
1161 1161
1162 } // namespace ash 1162 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/shell/app_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698