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

Unified Diff: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

Issue 10810073: [cros] Flip enable-html5-camera switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Indentation fixes 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
Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
index 17d190a7c43c2a374fda788c48b53eb6703eba05..41e53b5069cc9d88b7d424e12d6cc09b8b61111b 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
@@ -67,10 +67,12 @@ void UserImageScreenHandler::GetLocalizedStrings(
l10n_util::GetStringUTF16(IDS_IMAGE_SCREEN_PROFILE_LOADING_PHOTO));
localized_strings->SetString("okButtonText",
l10n_util::GetStringUTF16(IDS_OK));
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableHtml5Camera))
+ if (!CommandLine::ForCurrentProcess()->
+ HasSwitch(switches::kDisableHtml5Camera)) {
localized_strings->SetString("cameraType", "webrtc");
- else
+ } else {
localized_strings->SetString("cameraType", "old");
+ }
}
void UserImageScreenHandler::Initialize() {
@@ -139,8 +141,10 @@ void UserImageScreenHandler::ShowCameraInitializing() {
void UserImageScreenHandler::CheckCameraPresence() {
// For WebRTC, camera presence checked is done on JS side.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableHtml5Camera))
+ if (!CommandLine::ForCurrentProcess()->
+ HasSwitch(switches::kDisableHtml5Camera)) {
return;
+ }
CameraDetector::StartPresenceCheck(
base::Bind(&UserImageScreenHandler::OnCameraPresenceCheckDone,
weak_factory_.GetWeakPtr()));
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698