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

Side by Side Diff: ui/display/chromeos/display_configurator.cc

Issue 697493002: Support transition between chrome and user mode console (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 "ui/display/chromeos/display_configurator.h" 5 #include "ui/display/chromeos/display_configurator.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 return; 194 return;
195 195
196 // If the delegate is already initialized don't update it (For example, tests 196 // If the delegate is already initialized don't update it (For example, tests
197 // set their own delegates). 197 // set their own delegates).
198 if (!native_display_delegate_) { 198 if (!native_display_delegate_) {
199 native_display_delegate_ = CreatePlatformNativeDisplayDelegate(); 199 native_display_delegate_ = CreatePlatformNativeDisplayDelegate();
200 native_display_delegate_->AddObserver(this); 200 native_display_delegate_->AddObserver(this);
201 } 201 }
202 } 202 }
203 203
204 void DisplayConfigurator::TakeControl() {
205 NOTIMPLEMENTED();
206 }
207
208 void DisplayConfigurator::RelinquishControl() {
209 NOTIMPLEMENTED();
210 }
211
204 void DisplayConfigurator::ForceInitialConfigure( 212 void DisplayConfigurator::ForceInitialConfigure(
205 uint32_t background_color_argb) { 213 uint32_t background_color_argb) {
206 if (!configure_display_) 214 if (!configure_display_)
207 return; 215 return;
208 216
209 native_display_delegate_->GrabServer(); 217 native_display_delegate_->GrabServer();
210 native_display_delegate_->Initialize(); 218 native_display_delegate_->Initialize();
211 219
212 UpdateCachedDisplays(); 220 UpdateCachedDisplays();
213 if (cached_displays_.size() > 1 && background_color_argb) 221 if (cached_displays_.size() > 1 && background_color_argb)
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 return state_controller_->GetStateForDisplayIds(display_ids); 978 return state_controller_->GetStateForDisplayIds(display_ids);
971 } 979 }
972 } 980 }
973 default: 981 default:
974 NOTREACHED(); 982 NOTREACHED();
975 } 983 }
976 return MULTIPLE_DISPLAY_STATE_INVALID; 984 return MULTIPLE_DISPLAY_STATE_INVALID;
977 } 985 }
978 986
979 } // namespace ui 987 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698