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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/user_switch_animator_chromeos.h" 5 #include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
6 6
7 #include "ash/desktop_background/user_wallpaper_delegate.h" 7 #include "ash/desktop_background/user_wallpaper_delegate.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shelf/shelf_widget.h" 10 #include "ash/shelf/shelf_widget.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 void OnLayerAnimationAborted(ui::LayerAnimationSequence* sequence) override { 73 void OnLayerAnimationAborted(ui::LayerAnimationSequence* sequence) override {
74 delete this; 74 delete this;
75 } 75 }
76 76
77 void OnLayerAnimationScheduled( 77 void OnLayerAnimationScheduled(
78 ui::LayerAnimationSequence* sequence) override {} 78 ui::LayerAnimationSequence* sequence) override {}
79 79
80 private: 80 private:
81 ui::LayerAnimator* animator_; 81 ui::LayerAnimator* animator_;
82 scoped_ptr<ui::LayerTreeOwner> old_layer_; 82 std::unique_ptr<ui::LayerTreeOwner> old_layer_;
83 83
84 DISALLOW_COPY_AND_ASSIGN(MaximizedWindowAnimationWatcher); 84 DISALLOW_COPY_AND_ASSIGN(MaximizedWindowAnimationWatcher);
85 }; 85 };
86 86
87 // Modifies the given |window_list| such that the most-recently used window (if 87 // Modifies the given |window_list| such that the most-recently used window (if
88 // any, and if it exists in |window_list|) will be the last window in the list. 88 // any, and if it exists in |window_list|) will be the last window in the list.
89 void PutMruWindowLast(std::vector<aura::Window*>* window_list) { 89 void PutMruWindowLast(std::vector<aura::Window*>* window_list) {
90 DCHECK(window_list); 90 DCHECK(window_list);
91 auto active_window = ash::wm::GetActiveWindow(); 91 auto active_window = ash::wm::GetActiveWindow();
92 if (!active_window) 92 if (!active_window)
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 if (itr != window_to_entry_map.end()) { 438 if (itr != window_to_entry_map.end()) {
439 windows_by_account_id_[itr->second->show_for_user()].push_back( 439 windows_by_account_id_[itr->second->show_for_user()].push_back(
440 child_window); 440 child_window);
441 } 441 }
442 } 442 }
443 } 443 }
444 } 444 }
445 } 445 }
446 446
447 } // namespace chrome 447 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698