| 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" |
| 11 #include "ash/display/output_configurator_animation.h" | 11 #include "ash/display/output_configurator_animation.h" |
| 12 #include "ash/display/resolution_notification_controller.h" | 12 #include "ash/display/resolution_notification_controller.h" |
| 13 #include "ash/screen_ash.h" | |
| 14 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 15 #include "base/bind.h" | 14 #include "base/bind.h" |
| 16 #include "base/logging.h" | 15 #include "base/logging.h" |
| 17 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
| 18 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
| 19 #include "base/values.h" | 18 #include "base/values.h" |
| 20 #include "chrome/browser/chromeos/display/display_preferences.h" | 19 #include "chrome/browser/chromeos/display/display_preferences.h" |
| 21 #include "chromeos/display/output_configurator.h" | 20 #include "chromeos/display/output_configurator.h" |
| 22 #include "content/public/browser/web_ui.h" | 21 #include "content/public/browser/web_ui.h" |
| 23 #include "grit/ash_strings.h" | 22 #include "grit/ash_strings.h" |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 else if (rotation_value == "270") | 396 else if (rotation_value == "270") |
| 398 new_rotation = gfx::Display::ROTATE_270; | 397 new_rotation = gfx::Display::ROTATE_270; |
| 399 else if (rotation_value != "0") | 398 else if (rotation_value != "0") |
| 400 LOG(ERROR) << "Invalid rotation: " << rotation_value << " Falls back to 0"; | 399 LOG(ERROR) << "Invalid rotation: " << rotation_value << " Falls back to 0"; |
| 401 | 400 |
| 402 GetDisplayManager()->SetDisplayRotation(display_id, new_rotation); | 401 GetDisplayManager()->SetDisplayRotation(display_id, new_rotation); |
| 403 } | 402 } |
| 404 | 403 |
| 405 } // namespace options | 404 } // namespace options |
| 406 } // namespace chromeos | 405 } // namespace chromeos |
| OLD | NEW |