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

Side by Side Diff: ash/shell.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: OK, it can't be explicit for mac. Created 3 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
« no previous file with comments | « ash/mus/move_event_handler.cc ('k') | ash/test/mirror_window_test_api.h » ('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 #include <utility> 9 #include <utility>
10 10
(...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 audio_a11y_controller_.reset(new chromeos::AudioA11yController); 1060 audio_a11y_controller_.reset(new chromeos::AudioA11yController);
1061 1061
1062 // Initialize the wallpaper after the RootWindowController has been created, 1062 // Initialize the wallpaper after the RootWindowController has been created,
1063 // otherwise the widget will not paint when restoring after a browser crash. 1063 // otherwise the widget will not paint when restoring after a browser crash.
1064 // Also, initialize after display initialization to ensure correct sizing. 1064 // Also, initialize after display initialization to ensure correct sizing.
1065 wallpaper_delegate_->InitializeWallpaper(); 1065 wallpaper_delegate_->InitializeWallpaper();
1066 1066
1067 if (cursor_manager_) { 1067 if (cursor_manager_) {
1068 if (initially_hide_cursor_) 1068 if (initially_hide_cursor_)
1069 cursor_manager_->HideCursor(); 1069 cursor_manager_->HideCursor();
1070 cursor_manager_->SetCursor(ui::kCursorPointer); 1070 cursor_manager_->SetCursor(ui::CursorType::kPointer);
1071 } 1071 }
1072 1072
1073 power_event_observer_.reset(new PowerEventObserver()); 1073 power_event_observer_.reset(new PowerEventObserver());
1074 user_activity_notifier_.reset( 1074 user_activity_notifier_.reset(
1075 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get())); 1075 new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get()));
1076 video_activity_notifier_.reset( 1076 video_activity_notifier_.reset(
1077 new VideoActivityNotifier(video_detector_.get())); 1077 new VideoActivityNotifier(video_detector_.get()));
1078 bluetooth_notification_controller_.reset(new BluetoothNotificationController); 1078 bluetooth_notification_controller_.reset(new BluetoothNotificationController);
1079 if (config != Config::MASH) { 1079 if (config != Config::MASH) {
1080 screen_orientation_controller_.reset(new ScreenOrientationController()); 1080 screen_orientation_controller_.reset(new ScreenOrientationController());
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 void Shell::OnPrefServiceInitialized( 1236 void Shell::OnPrefServiceInitialized(
1237 std::unique_ptr<::PrefService> pref_service) { 1237 std::unique_ptr<::PrefService> pref_service) {
1238 if (!instance_) 1238 if (!instance_)
1239 return; 1239 return;
1240 // |pref_service_| is null if can't connect to Chrome (as happens when 1240 // |pref_service_| is null if can't connect to Chrome (as happens when
1241 // running mash outside of chrome --mash and chrome isn't built). 1241 // running mash outside of chrome --mash and chrome isn't built).
1242 pref_service_ = std::move(pref_service); 1242 pref_service_ = std::move(pref_service);
1243 } 1243 }
1244 1244
1245 } // namespace ash 1245 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/move_event_handler.cc ('k') | ash/test/mirror_window_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698