| 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/shell.h" | 13 #include "ash/shell.h" |
| 14 #include "base/bind.h" | 14 #include "base/bind.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
| 17 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
| 18 #include "base/values.h" | 18 #include "base/values.h" |
| 19 #include "chrome/browser/chromeos/display/display_preferences.h" | 19 #include "chrome/browser/chromeos/display/display_preferences.h" |
| 20 #include "chromeos/display/output_configurator.h" | |
| 21 #include "content/public/browser/web_ui.h" | 20 #include "content/public/browser/web_ui.h" |
| 22 #include "grit/ash_strings.h" | 21 #include "grit/ash_strings.h" |
| 23 #include "grit/generated_resources.h" | 22 #include "grit/generated_resources.h" |
| 24 #include "ui/base/l10n/l10n_util.h" | 23 #include "ui/base/l10n/l10n_util.h" |
| 25 #include "ui/gfx/display.h" | 24 #include "ui/gfx/display.h" |
| 26 #include "ui/gfx/rect.h" | 25 #include "ui/gfx/rect.h" |
| 27 #include "ui/gfx/screen.h" | 26 #include "ui/gfx/screen.h" |
| 28 #include "ui/gfx/size_conversions.h" | 27 #include "ui/gfx/size_conversions.h" |
| 29 | 28 |
| 30 using ash::internal::DisplayManager; | 29 using ash::internal::DisplayManager; |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 else if (rotation_value == "270") | 401 else if (rotation_value == "270") |
| 403 new_rotation = gfx::Display::ROTATE_270; | 402 new_rotation = gfx::Display::ROTATE_270; |
| 404 else if (rotation_value != "0") | 403 else if (rotation_value != "0") |
| 405 LOG(ERROR) << "Invalid rotation: " << rotation_value << " Falls back to 0"; | 404 LOG(ERROR) << "Invalid rotation: " << rotation_value << " Falls back to 0"; |
| 406 | 405 |
| 407 GetDisplayManager()->SetDisplayRotation(display_id, new_rotation); | 406 GetDisplayManager()->SetDisplayRotation(display_id, new_rotation); |
| 408 } | 407 } |
| 409 | 408 |
| 410 } // namespace options | 409 } // namespace options |
| 411 } // namespace chromeos | 410 } // namespace chromeos |
| OLD | NEW |