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

Side by Side Diff: chrome/browser/chromeos/display/display_preferences.cc

Issue 204813006: Adds UMA for display color calibration in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix failure Created 6 years, 9 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
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 "chrome/browser/chromeos/display/display_preferences.h" 5 #include "chrome/browser/chromeos/display/display_preferences.h"
6 6
7 #include "ash/display/display_layout_store.h" 7 #include "ash/display/display_layout_store.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/display/display_pref_util.h" 9 #include "ash/display/display_pref_util.h"
10 #include "ash/display/resolution_notification_controller.h" 10 #include "ash/display/resolution_notification_controller.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 std::string ColorProfileToString(ui::ColorCalibrationProfile profile) { 65 std::string ColorProfileToString(ui::ColorCalibrationProfile profile) {
66 switch (profile) { 66 switch (profile) {
67 case ui::COLOR_PROFILE_STANDARD: 67 case ui::COLOR_PROFILE_STANDARD:
68 return "standard"; 68 return "standard";
69 case ui::COLOR_PROFILE_DYNAMIC: 69 case ui::COLOR_PROFILE_DYNAMIC:
70 return "dynamic"; 70 return "dynamic";
71 case ui::COLOR_PROFILE_MOVIE: 71 case ui::COLOR_PROFILE_MOVIE:
72 return "movie"; 72 return "movie";
73 case ui::COLOR_PROFILE_READING: 73 case ui::COLOR_PROFILE_READING:
74 return "reading"; 74 return "reading";
75 case ui::NUM_COLOR_PROFILES:
76 break;
75 } 77 }
76 NOTREACHED(); 78 NOTREACHED();
77 return ""; 79 return "";
78 } 80 }
79 81
80 ui::ColorCalibrationProfile StringToColorProfile(std::string value) { 82 ui::ColorCalibrationProfile StringToColorProfile(std::string value) {
81 if (value == "standard") 83 if (value == "standard")
82 return ui::COLOR_PROFILE_STANDARD; 84 return ui::COLOR_PROFILE_STANDARD;
83 else if (value == "dynamic") 85 else if (value == "dynamic")
84 return ui::COLOR_PROFILE_DYNAMIC; 86 return ui::COLOR_PROFILE_DYNAMIC;
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 const ash::DisplayLayout& layout) { 339 const ash::DisplayLayout& layout) {
338 StoreDisplayLayoutPref(std::make_pair(id1, id2), layout); 340 StoreDisplayLayoutPref(std::make_pair(id1, id2), layout);
339 } 341 }
340 342
341 // Stores the given |power_state|. 343 // Stores the given |power_state|.
342 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) { 344 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
343 StoreDisplayPowerState(power_state); 345 StoreDisplayPowerState(power_state);
344 } 346 }
345 347
346 } // namespace chromeos 348 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/display/display_manager.cc ('k') | 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