Revert 48186, 48196, 48198

chrome/browser/views/select_profile_dialog.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/views/select_profile_dialog.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 64 matching lines @@
 
 views::View* SelectProfileDialog::GetInitiallyFocusedView() {
   return profile_combobox_;
 }
 
 std::wstring SelectProfileDialog::GetWindowTitle() const {
   return l10n_util::GetString(IDS_SELECT_PROFILE_DIALOG_TITLE);
 }
 
 bool SelectProfileDialog::Accept() {
-  size_t index = profile_combobox_->selected_item();
-  if (index > profiles_.size()) {
+  int index = profile_combobox_->selected_item();
+  if (index < 0) {
     NOTREACHED();
     return true;
   }
 
   // If the user has selected <New Profile> from the drop down, then show the
   // new profile dialog to the user.
   if (index == profiles_.size()) {
     NewProfileDialog::RunDialog();
-  } else {
-    std::wstring profile_name = profiles_[index];
-    UserDataManager::Get()->LaunchChromeForProfile(profile_name);
+    return true;
   }
+
+  std::wstring profile_name = profiles_[index];
+  UserDataManager::Get()->LaunchChromeForProfile(profile_name);
   return true;
 }
 
 bool SelectProfileDialog::Cancel() {
   return true;
 }
 
 views::View* SelectProfileDialog::GetContentsView() {
   return this;
 }
 
 int SelectProfileDialog::GetItemCount() {
   // Always show one more item in the combo box that allows the user to select
   // <New Profile>.
   return profiles_.size() + 1;
 }
 
 std::wstring SelectProfileDialog::GetItemAt(int index) {
-  size_t index_size_t = index;
-  DCHECK_LE(index_size_t, profiles_.size());
+  DCHECK(index >= 0 && index <= static_cast<int>(profiles_.size()));
   // For the last item in the drop down, return the <New Profile> text,
   // otherwise return the corresponding profile name from the vector.
-  return index_size_t == profiles_.size() ?
+  return index == profiles_.size() ?
       l10n_util::GetString(IDS_SELECT_PROFILE_DIALOG_NEW_PROFILE_ENTRY) :
       profiles_[index];
 }
 
 void SelectProfileDialog::OnGetProfilesDone(
     const std::vector<std::wstring>& profiles) {
   PopulateProfilesComboBox(profiles);
 }
 
 void SelectProfileDialog::SetupControls() {
@@ skipping 12 matching lines @@
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::FIXED, 200, 0);
 
   layout->StartRow(0, column_set_id);
   layout->AddView(select_profile_label_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, column_set_id);
   layout->AddView(profile_combobox_);
 }