[cros] Flip enable-html5-camera switch.

chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc

Index: chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
index d2aad4c309cf8083a41583d64b01965b27c27d99..3d1b4bbcd75e1eb1fc56a92026bbdcdf7d328edf 100644
--- a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
@@ -101,10 +101,12 @@ void ChangePictureOptionsHandler::GetLocalizedValues(
           IDS_OPTIONS_CHANGE_PICTURE_PROFILE_LOADING_PHOTO));
   localized_strings->SetString("previewAltText",
       l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_PREVIEW_ALT));
-  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.

     localized_strings->SetString("cameraType", "webrtc");
-  else
+  } else {
     localized_strings->SetString("cameraType", "old");
+  }
 }
 
 void ChangePictureOptionsHandler::RegisterMessages() {
@@ -196,8 +198,8 @@ void ChangePictureOptionsHandler::HandlePageInitialized(
     const base::ListValue* args) {
   DCHECK(args && args->empty());
 
-  if (!CommandLine::ForCurrentProcess()->
-          HasSwitch(switches::kEnableHtml5Camera)) {
+  if (CommandLine::ForCurrentProcess()->
+          HasSwitch(switches::kDisableHtml5Camera)) {
     // If no camera presence check has been performed in this session,
     // start one now.
     if (CameraDetector::camera_presence() ==
@@ -365,8 +367,10 @@ void ChangePictureOptionsHandler::OnPhotoAccepted(const gfx::ImageSkia& photo) {
 
 void ChangePictureOptionsHandler::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(&ChangePictureOptionsHandler::OnCameraPresenceCheckDone,
                  weak_factory_.GetWeakPtr()));