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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

Issue 12505005: Store rotation/ui scale to local state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
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 "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/display/display_controller.h" 9 #include "ash/display/display_controller.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 void DisplayOptionsHandler::OnFadeOutForMirroringFinished(bool is_mirroring) { 161 void DisplayOptionsHandler::OnFadeOutForMirroringFinished(bool is_mirroring) {
162 chromeos::OutputState new_state = 162 chromeos::OutputState new_state =
163 is_mirroring ? STATE_DUAL_MIRROR : STATE_DUAL_EXTENDED; 163 is_mirroring ? STATE_DUAL_MIRROR : STATE_DUAL_EXTENDED;
164 ash::Shell::GetInstance()->output_configurator()->SetDisplayMode(new_state); 164 ash::Shell::GetInstance()->output_configurator()->SetDisplayMode(new_state);
165 // Not necessary to start fade-in animation. OutputConfigurator will do that. 165 // Not necessary to start fade-in animation. OutputConfigurator will do that.
166 } 166 }
167 167
168 void DisplayOptionsHandler::OnFadeOutForDisplayLayoutFinished( 168 void DisplayOptionsHandler::OnFadeOutForDisplayLayoutFinished(
169 int position, int offset) { 169 int position, int offset) {
170 SetCurrentAndDefaultDisplayLayout( 170 SetCurrentAndDefaultDisplayLayout(
171 ash::DisplayLayout::FromInts(position, offset)); 171 ash::DisplayLayout::FromInts(position, offset, false));
172 ash::Shell::GetInstance()->output_configurator_animation()-> 172 ash::Shell::GetInstance()->output_configurator_animation()->
173 StartFadeInAnimation(); 173 StartFadeInAnimation();
174 } 174 }
175 175
176 void DisplayOptionsHandler::HandleDisplayInfo( 176 void DisplayOptionsHandler::HandleDisplayInfo(
177 const base::ListValue* unused_args) { 177 const base::ListValue* unused_args) {
178 SendAllDisplayInfo(); 178 SendAllDisplayInfo();
179 } 179 }
180 180
181 void DisplayOptionsHandler::HandleMirroring(const base::ListValue* args) { 181 void DisplayOptionsHandler::HandleMirroring(const base::ListValue* args) {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 ash::Shell::GetInstance()->output_configurator_animation()-> 221 ash::Shell::GetInstance()->output_configurator_animation()->
222 StartFadeOutAnimation(base::Bind( 222 StartFadeOutAnimation(base::Bind(
223 &DisplayOptionsHandler::OnFadeOutForDisplayLayoutFinished, 223 &DisplayOptionsHandler::OnFadeOutForDisplayLayoutFinished,
224 base::Unretained(this), 224 base::Unretained(this),
225 static_cast<int>(layout), 225 static_cast<int>(layout),
226 static_cast<int>(offset))); 226 static_cast<int>(offset)));
227 } 227 }
228 228
229 } // namespace options 229 } // namespace options
230 } // namespace chromeos 230 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate_views.cc ('k') | chromeos/display/output_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698