| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_STANDARD); | 67 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_STANDARD); |
| 68 case ui::COLOR_PROFILE_DYNAMIC: | 68 case ui::COLOR_PROFILE_DYNAMIC: |
| 69 return l10n_util::GetStringUTF16( | 69 return l10n_util::GetStringUTF16( |
| 70 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_DYNAMIC); | 70 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_DYNAMIC); |
| 71 case ui::COLOR_PROFILE_MOVIE: | 71 case ui::COLOR_PROFILE_MOVIE: |
| 72 return l10n_util::GetStringUTF16( | 72 return l10n_util::GetStringUTF16( |
| 73 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_MOVIE); | 73 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_MOVIE); |
| 74 case ui::COLOR_PROFILE_READING: | 74 case ui::COLOR_PROFILE_READING: |
| 75 return l10n_util::GetStringUTF16( | 75 return l10n_util::GetStringUTF16( |
| 76 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_READING); | 76 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_COLOR_PROFILE_READING); |
| 77 case ui::NUM_COLOR_PROFILES: |
| 78 break; |
| 77 } | 79 } |
| 78 | 80 |
| 79 NOTREACHED(); | 81 NOTREACHED(); |
| 80 return base::string16(); | 82 return base::string16(); |
| 81 } | 83 } |
| 82 | 84 |
| 83 } // namespace | 85 } // namespace |
| 84 | 86 |
| 85 DisplayOptionsHandler::DisplayOptionsHandler() { | 87 DisplayOptionsHandler::DisplayOptionsHandler() { |
| 86 ash::Shell::GetInstance()->display_controller()->AddObserver(this); | 88 ash::Shell::GetInstance()->display_controller()->AddObserver(this); |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 470 return; | 472 return; |
| 471 } | 473 } |
| 472 | 474 |
| 473 GetDisplayManager()->SetColorCalibrationProfile( | 475 GetDisplayManager()->SetColorCalibrationProfile( |
| 474 display_id, static_cast<ui::ColorCalibrationProfile>(profile_id)); | 476 display_id, static_cast<ui::ColorCalibrationProfile>(profile_id)); |
| 475 SendAllDisplayInfo(); | 477 SendAllDisplayInfo(); |
| 476 } | 478 } |
| 477 | 479 |
| 478 } // namespace options | 480 } // namespace options |
| 479 } // namespace chromeos | 481 } // namespace chromeos |
| OLD | NEW |