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

Unified Diff: chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc

Issue 10824071: chromeos: output_configurator: various style fixes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromeos/display/output_configurator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc
index 739f6118a947bf3255922e95703f4e645d61655c..806574a1b276bfc96c8f953b30d6120d5d578caf 100644
--- a/chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc
@@ -86,7 +86,7 @@ void DisplayOptionsHandler::OnDisplayRemoved(const gfx::Display& old_display) {
void DisplayOptionsHandler::UpdateDisplaySectionVisibility() {
aura::DisplayManager* display_manager =
aura::Env::GetInstance()->display_manager();
- chromeos::State output_state =
+ chromeos::OutputState output_state =
ash::Shell::GetInstance()->output_configurator()->output_state();
base::FundamentalValue show_options(
DisplayController::IsExtendedDesktopEnabled() &&
@@ -139,7 +139,7 @@ void DisplayOptionsHandler::HandleMirroring(const base::ListValue* args) {
args->GetBoolean(0, &is_mirroring);
// We use 'PRIMARY_ONLY' for non-mirroring state for now.
// TODO(mukai): fix this and support multiple display modes.
- chromeos::State new_state =
+ chromeos::OutputState new_state =
is_mirroring ? STATE_DUAL_MIRROR : STATE_DUAL_PRIMARY_ONLY;
ash::Shell::GetInstance()->output_configurator()->SetDisplayMode(new_state);
SendDisplayInfo();
« no previous file with comments | « no previous file | chromeos/display/output_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698