[cros] Flip enable-html5-camera switch.

chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 49 matching lines @@
   localized_strings->SetString("userImageScreenDescription",
       l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT));
   localized_strings->SetString("takePhoto",
       l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_TAKE_PHOTO));
   localized_strings->SetString("profilePhoto",
       l10n_util::GetStringUTF16(IDS_IMAGE_SCREEN_PROFILE_PHOTO));
   localized_strings->SetString("profilePhotoLoading",
       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 spaces from the start of the
'('.

[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() {
   ListValue image_urls;
   for (int i = 0; i < kDefaultImagesCount; ++i) {
     image_urls.Append(new StringValue(GetDefaultImageUrl(i)));
   }
   web_ui()->CallJavascriptFunction("oobe.UserImageScreen.setUserImages",
                                    image_urls);
 
@@ skipping 48 matching lines @@
 }
 
 void UserImageScreenHandler::ShowCameraError() {
 }
 
 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()));
 }
 
 bool UserImageScreenHandler::IsCapturing() const {
   return false;
 }
 
 void UserImageScreenHandler::RegisterMessages() {
@@ skipping 135 matching lines @@
   user_photo_ = gfx::ImageSkia(decoded_image);
   if (screen_ && accept_photo_after_decoding_)
     screen_->OnPhotoTaken(user_photo_);
 }
 
 void UserImageScreenHandler::OnDecodeImageFailed(const ImageDecoder* decoder) {
   NOTREACHED() << "Failed to decode PNG image from WebUI";
 }
 
 }  // namespace chromeos