| OLD | NEW |
| 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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 offset_value.reset(new base::FundamentalValue(layout.offset)); | 296 offset_value.reset(new base::FundamentalValue(layout.offset)); |
| 297 } | 297 } |
| 298 | 298 |
| 299 web_ui()->CallJavascriptFunction( | 299 web_ui()->CallJavascriptFunction( |
| 300 "options.DisplayOptions.setDisplayInfo", | 300 "options.DisplayOptions.setDisplayInfo", |
| 301 mirroring, js_displays, *layout_value.get(), *offset_value.get()); | 301 mirroring, js_displays, *layout_value.get(), *offset_value.get()); |
| 302 } | 302 } |
| 303 | 303 |
| 304 void DisplayOptionsHandler::OnFadeOutForMirroringFinished(bool is_mirroring) { | 304 void DisplayOptionsHandler::OnFadeOutForMirroringFinished(bool is_mirroring) { |
| 305 ash::Shell::GetInstance()->display_manager()->SetMirrorMode(is_mirroring); | 305 ash::Shell::GetInstance()->display_manager()->SetMirrorMode(is_mirroring); |
| 306 // Not necessary to start fade-in animation. OutputConfigurator will do that. | 306 // Not necessary to start fade-in animation. DisplayConfigurator will do that. |
| 307 } | 307 } |
| 308 | 308 |
| 309 void DisplayOptionsHandler::OnFadeOutForDisplayLayoutFinished( | 309 void DisplayOptionsHandler::OnFadeOutForDisplayLayoutFinished( |
| 310 int position, int offset) { | 310 int position, int offset) { |
| 311 SetCurrentDisplayLayout( | 311 SetCurrentDisplayLayout( |
| 312 ash::DisplayLayout::FromInts(position, offset)); | 312 ash::DisplayLayout::FromInts(position, offset)); |
| 313 ash::Shell::GetInstance()->output_configurator_animation()-> | 313 ash::Shell::GetInstance()->output_configurator_animation()-> |
| 314 StartFadeInAnimation(); | 314 StartFadeInAnimation(); |
| 315 } | 315 } |
| 316 | 316 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 return; | 480 return; |
| 481 } | 481 } |
| 482 | 482 |
| 483 GetDisplayManager()->SetColorCalibrationProfile( | 483 GetDisplayManager()->SetColorCalibrationProfile( |
| 484 display_id, static_cast<ui::ColorCalibrationProfile>(profile_id)); | 484 display_id, static_cast<ui::ColorCalibrationProfile>(profile_id)); |
| 485 SendAllDisplayInfo(); | 485 SendAllDisplayInfo(); |
| 486 } | 486 } |
| 487 | 487 |
| 488 } // namespace options | 488 } // namespace options |
| 489 } // namespace chromeos | 489 } // namespace chromeos |
| OLD | NEW |