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..f556a71c0eb4468d3815b3c0613bb87079103853 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)) { |
James Hawkins
2012/07/24 18:22:19
Indentation is off here. I believe it should be 4
Ivan Korotkov
2012/07/24 20:11:57
Oops, right. Emacs issues.
|
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)) { |
James Hawkins
2012/07/24 18:22:19
Indentation.
Ivan Korotkov
2012/07/24 20:11:57
Done.
|
return; |
+ } |
CameraDetector::StartPresenceCheck( |
base::Bind(&UserImageScreenHandler::OnCameraPresenceCheckDone, |
weak_factory_.GetWeakPtr())); |