Take two at splitting result codes between content and chrome.

chrome/browser/ui/views/uninstall_view.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/ui/views/uninstall_view.h"
 
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/shell_integration.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/shell_util.h"
-#include "content/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 
 UninstallView::UninstallView(int& user_selection)
     : confirm_label_(NULL),
       delete_profile_(NULL),
@@ skipping 65 matching lines @@
       browsers_combo_ = new views::Combobox(this);
       layout->AddView(browsers_combo_);
       browsers_combo_->SetEnabled(false);
     }
   }
 
   layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 }
 
 bool UninstallView::Accept() {
-  user_selection_ = ResultCodes::NORMAL_EXIT;
+  user_selection_ = content::RESULT_CODE_NORMAL_EXIT;
   if (delete_profile_->checked())
-    user_selection_ = ResultCodes::UNINSTALL_DELETE_PROFILE;
+    user_selection_ = chrome::RESULT_CODE_UNINSTALL_DELETE_PROFILE;
   if (change_default_browser_ && change_default_browser_->checked()) {
     int index = browsers_combo_->selected_item();
     BrowsersMap::const_iterator it = browsers_->begin();
     std::advance(it, index);
     base::LaunchApp((*it).second, false, true, NULL);
   }
   return true;
 }
 
 bool UninstallView::Cancel() {
-  user_selection_ = ResultCodes::UNINSTALL_USER_CANCEL;
+  user_selection_ = chrome::RESULT_CODE_UNINSTALL_USER_CANCEL;
   return true;
 }
 
 std::wstring UninstallView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   // We only want to give custom name to OK button - 'Uninstall'. Cancel
   // button remains same.
   std::wstring label = L"";
   if (button == MessageBoxFlags::DIALOGBUTTON_OK)
     label = UTF16ToWide(l10n_util::GetStringUTF16(IDS_UNINSTALL_BUTTON_TEXT));
@@ skipping 21 matching lines @@
   DCHECK(!browsers_->empty());
   return browsers_->size();
 }
 
 string16 UninstallView::GetItemAt(int index) {
   DCHECK(index < (int) browsers_->size());
   BrowsersMap::const_iterator it = browsers_->begin();
   std::advance(it, index);
   return WideToUTF16Hack((*it).first);
 }