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

Side by Side Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

Issue 857433003: Update {virtual,override,final} to follow C++11 style chrome/browser/ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase Created 5 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui/ash/multi_user/multi_user_window_manager_chromeos.h" 5 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/multi_profile_uma.h" 8 #include "ash/multi_profile_uma.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 DISALLOW_COPY_AND_ASSIGN(AnimationSetter); 185 DISALLOW_COPY_AND_ASSIGN(AnimationSetter);
186 }; 186 };
187 187
188 // This class keeps track of all applications which were started for a user. 188 // This class keeps track of all applications which were started for a user.
189 // When an app gets created, the window will be tagged for that user. Note 189 // When an app gets created, the window will be tagged for that user. Note
190 // that the destruction does not need to be tracked here since the universal 190 // that the destruction does not need to be tracked here since the universal
191 // window observer will take care of that. 191 // window observer will take care of that.
192 class AppObserver : public extensions::AppWindowRegistry::Observer { 192 class AppObserver : public extensions::AppWindowRegistry::Observer {
193 public: 193 public:
194 explicit AppObserver(const std::string& user_id) : user_id_(user_id) {} 194 explicit AppObserver(const std::string& user_id) : user_id_(user_id) {}
195 virtual ~AppObserver() {} 195 ~AppObserver() override {}
196 196
197 // AppWindowRegistry::Observer overrides: 197 // AppWindowRegistry::Observer overrides:
198 virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override { 198 void OnAppWindowAdded(extensions::AppWindow* app_window) override {
199 aura::Window* window = app_window->GetNativeWindow(); 199 aura::Window* window = app_window->GetNativeWindow();
200 DCHECK(window); 200 DCHECK(window);
201 MultiUserWindowManagerChromeOS::GetInstance()->SetWindowOwner(window, 201 MultiUserWindowManagerChromeOS::GetInstance()->SetWindowOwner(window,
202 user_id_); 202 user_id_);
203 } 203 }
204 204
205 private: 205 private:
206 std::string user_id_; 206 std::string user_id_;
207 207
208 DISALLOW_COPY_AND_ASSIGN(AppObserver); 208 DISALLOW_COPY_AND_ASSIGN(AppObserver);
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 DCHECK_EQ(visible, window->IsVisible()); 729 DCHECK_EQ(visible, window->IsVisible());
730 } 730 }
731 731
732 int MultiUserWindowManagerChromeOS::GetAdjustedAnimationTimeInMS( 732 int MultiUserWindowManagerChromeOS::GetAdjustedAnimationTimeInMS(
733 int default_time_in_ms) const { 733 int default_time_in_ms) const {
734 return animation_speed_ == ANIMATION_SPEED_NORMAL ? default_time_in_ms : 734 return animation_speed_ == ANIMATION_SPEED_NORMAL ? default_time_in_ms :
735 (animation_speed_ == ANIMATION_SPEED_FAST ? 10 : 0); 735 (animation_speed_ == ANIMATION_SPEED_FAST ? 10 : 0);
736 } 736 }
737 737
738 } // namespace chrome 738 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698