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

Side by Side Diff: ash/shell.cc

Issue 1551133002: Convert Pass()→std::move() in //ash (CrOS edition) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 (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 #include <utility> 9 #include <utility>
10 10
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after
1055 user_wallpaper_delegate_->InitializeWallpaper(); 1055 user_wallpaper_delegate_->InitializeWallpaper();
1056 1056
1057 if (initially_hide_cursor_) 1057 if (initially_hide_cursor_)
1058 cursor_manager_.HideCursor(); 1058 cursor_manager_.HideCursor();
1059 cursor_manager_.SetCursor(ui::kCursorPointer); 1059 cursor_manager_.SetCursor(ui::kCursorPointer);
1060 1060
1061 #if defined(OS_CHROMEOS) 1061 #if defined(OS_CHROMEOS)
1062 // Set accelerator controller delegates. 1062 // Set accelerator controller delegates.
1063 accelerator_controller_->SetBrightnessControlDelegate( 1063 accelerator_controller_->SetBrightnessControlDelegate(
1064 scoped_ptr<ash::BrightnessControlDelegate>( 1064 scoped_ptr<ash::BrightnessControlDelegate>(
1065 new ash::system::BrightnessControllerChromeos).Pass()); 1065 new ash::system::BrightnessControllerChromeos));
1066 1066
1067 power_event_observer_.reset(new PowerEventObserver()); 1067 power_event_observer_.reset(new PowerEventObserver());
1068 user_activity_notifier_.reset( 1068 user_activity_notifier_.reset(
1069 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get())); 1069 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get()));
1070 video_activity_notifier_.reset( 1070 video_activity_notifier_.reset(
1071 new VideoActivityNotifier(video_detector_.get())); 1071 new VideoActivityNotifier(video_detector_.get()));
1072 bluetooth_notification_controller_.reset(new BluetoothNotificationController); 1072 bluetooth_notification_controller_.reset(new BluetoothNotificationController);
1073 last_window_closed_logout_reminder_.reset(new LastWindowClosedLogoutReminder); 1073 last_window_closed_logout_reminder_.reset(new LastWindowClosedLogoutReminder);
1074 screen_orientation_controller_.reset(new ScreenOrientationController()); 1074 screen_orientation_controller_.reset(new ScreenOrientationController());
1075 #endif 1075 #endif
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 1169
1170 void Shell::OnWindowActivated( 1170 void Shell::OnWindowActivated(
1171 aura::client::ActivationChangeObserver::ActivationReason reason, 1171 aura::client::ActivationChangeObserver::ActivationReason reason,
1172 aura::Window* gained_active, 1172 aura::Window* gained_active,
1173 aura::Window* lost_active) { 1173 aura::Window* lost_active) {
1174 if (gained_active) 1174 if (gained_active)
1175 target_root_window_ = gained_active->GetRootWindow(); 1175 target_root_window_ = gained_active->GetRootWindow();
1176 } 1176 }
1177 1177
1178 } // namespace ash 1178 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/resolution_notification_controller.cc ('k') | ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698