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

Side by Side Diff: ash/system/chromeos/tray_display.cc

Issue 12254041: Reconfigure displays even if the output count didn't change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options/chromeos/display_options_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ash/system/chromeos/tray_display.h" 5 #include "ash/system/chromeos/tray_display.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/screen_ash.h" 9 #include "ash/screen_ash.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 case chromeos::STATE_HEADLESS: 61 case chromeos::STATE_HEADLESS:
62 case chromeos::STATE_SINGLE: 62 case chromeos::STATE_SINGLE:
63 SetVisible(false); 63 SetVisible(false);
64 return; 64 return;
65 case chromeos::STATE_DUAL_MIRROR: { 65 case chromeos::STATE_DUAL_MIRROR: {
66 label_->SetText(l10n_util::GetStringFUTF16( 66 label_->SetText(l10n_util::GetStringFUTF16(
67 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING, GetExternalDisplayName())); 67 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING, GetExternalDisplayName()));
68 SetVisible(true); 68 SetVisible(true);
69 return; 69 return;
70 } 70 }
71 case chromeos::STATE_DUAL_PRIMARY_ONLY: 71 case chromeos::STATE_DUAL_EXTENDED:
72 case chromeos::STATE_DUAL_SECONDARY_ONLY:
73 case chromeos::STATE_DUAL_UNKNOWN: { 72 case chromeos::STATE_DUAL_UNKNOWN: {
74 label_->SetText(l10n_util::GetStringFUTF16( 73 label_->SetText(l10n_util::GetStringFUTF16(
75 IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED, GetExternalDisplayName())); 74 IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED, GetExternalDisplayName()));
76 SetVisible(true); 75 SetVisible(true);
77 return; 76 return;
78 } 77 }
79 default: 78 default:
80 NOTREACHED(); 79 NOTREACHED();
81 } 80 }
82 } 81 }
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 default_->Update(); 182 default_->Update();
184 } 183 }
185 184
186 void TrayDisplay::OnDisplayModeChanged() { 185 void TrayDisplay::OnDisplayModeChanged() {
187 if (default_) 186 if (default_)
188 default_->Update(); 187 default_->Update();
189 } 188 }
190 189
191 } // namespace internal 190 } // namespace internal
192 } // namespace ash 191 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/options/chromeos/display_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698