Merge 11274 - Fixes issue 8435 (http://code.google.com/p/chromium/issues/deta...

chrome/browser/browser.cc

 // Copyright (c) 2006-2008 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/browser.h"
 
 #include "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 936 matching lines @@
   GetSelectedTabContents()->AsWebContents()->render_view_host()->
       ShowJavaScriptConsole();
 }
 
 void Browser::OpenTaskManager() {
   UserMetrics::RecordAction(L"TaskManager", profile_);
   TaskManager::Open();
 }
 
 void Browser::OpenSelectProfileDialog() {
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (!command_line.HasSwitch(switches::kEnableUserDataDirProfiles))
+    return;
   UserMetrics::RecordAction(L"SelectProfile", profile_);
   window_->ShowSelectProfileDialog();
 }
 
 void Browser::OpenNewProfileDialog() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (!command_line.HasSwitch(switches::kEnableUserDataDirProfiles))
     return;
   UserMetrics::RecordAction(L"CreateProfile", profile_);
   window_->ShowNewProfileDialog();
@@ skipping 1491 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }