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

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

Issue 10974014: Disable extended desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated comments. keep pointer inside root Created 8 years, 3 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.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
index 6e5be0aa9d54947f381562b13e62c4ca643dffd7..92db9c1daa6d13bb869eb83584c7e16b46af65cf 100644
--- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
@@ -90,12 +90,9 @@ void DisplayOptionsHandler::OnDisplayRemoved(const gfx::Display& old_display) {
}
void DisplayOptionsHandler::UpdateDisplaySectionVisibility() {
- chromeos::OutputState output_state =
- ash::Shell::GetInstance()->output_configurator()->output_state();
- base::FundamentalValue show_options(
- output_state != chromeos::STATE_INVALID &&
- output_state != chromeos::STATE_HEADLESS &&
- output_state != chromeos::STATE_SINGLE);
+ // TODO(oshima): Temporarily disable the display options.
+ // crbug.com/152003.
+ base::FundamentalValue show_options(false);
web_ui()->CallJavascriptFunction(
"options.BrowserOptions.showDisplayOptions", show_options);
}
« no previous file with comments | « no previous file | chromeos/display/output_configurator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698