If --views-desktop is specified from the command line, respect it.

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2011 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/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1298 matching lines @@
   local_state->RegisterBooleanPref(prefs::kPrintingPrintPreviewEnabledOnce,
                                    false,
                                    PrefService::UNSYNCABLE_PREF);
   if (!local_state->GetBoolean(prefs::kPrintingPrintPreviewEnabledOnce)) {
     local_state->SetBoolean(prefs::kPrintingPrintPreviewEnabledOnce, true);
     about_flags::SetExperimentEnabled(local_state, "print-preview", true);
   }
 #endif
 
 #if defined(TOUCH_UI)
-  // Always add the --views-desktop flag. If the user disabled the flag from
-  // about:flags, it will get unset bt the call to ConvertFlagsToSwitches in the
-  // following line.
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kViewsDesktop,
-                                                      "other");
+  // Always add the --views-desktop flag, if not already set.
+  // If the user disabled the flag from about:flags, it will get unset by the
+  // call to ConvertFlagsToSwitches in the following line.
+  if (!parsed_command_line().HasSwitch(switches::kViewsDesktop))
+    CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kViewsDesktop,
+                                                        "other");
 #endif
 
   // Convert active labs into switches. Modifies the current command line.
   about_flags::ConvertFlagsToSwitches(local_state,
                                       CommandLine::ForCurrentProcess());
 
 #if defined(TOOLKIT_VIEWS)
   views::Widget::SetPureViews(
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
   // Launch the views desktop shell window and register it as the default parent
@@ skipping 678 matching lines @@
   if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
       (pre_read == "0" || pre_read == "1")) {
     std::string uma_name(name);
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }