Broke ARM compile.

chrome/browser/first_run/try_chrome_dialog_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/first_run/try_chrome_dialog_view.h"
 
 #include <shellapi.h>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 18 matching lines @@
 const wchar_t kHelpCenterUrl[] =
     L"https://www.google.com/support/chrome/bin/answer.py?answer=150752";
 
 }  // namespace
 
 TryChromeDialogView::TryChromeDialogView(size_t version)
     : version_(version),
       popup_(NULL),
       try_chrome_(NULL),
       kill_chrome_(NULL),
-      result_(upgrade_util::COUNT) {
+      result_(Upgrade::COUNT) {
 }
 
 TryChromeDialogView::~TryChromeDialogView() {
 }
 
-upgrade_util::TryResult TryChromeDialogView::ShowModal(
+Upgrade::TryResult TryChromeDialogView::ShowModal(
     ProcessSingleton* process_singleton) {
   using views::GridLayout;
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   views::ImageView* icon = new views::ImageView();
   icon->SetImage(*rb.GetBitmapNamed(IDR_PRODUCT_ICON_32));
   gfx::Size icon_size = icon->GetPreferredSize();
 
   // An approximate window size. After Layout() we'll get better bounds.
   views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_POPUP);
   params.can_activate = true;
   popup_ = views::Widget::CreateWidget(params);
   if (!popup_) {
     NOTREACHED();
-    return upgrade_util::DIALOG_ERROR;
+    return Upgrade::DIALOG_ERROR;
   }
 
   gfx::Rect pos(310, 160);
   popup_->Init(NULL, pos);
 
   views::RootView* root_view = popup_->GetRootView();
   // The window color is a tiny bit off-white.
   root_view->set_background(
       views::Background::CreateSolidBackground(0xfc, 0xfc, 0xfc));
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(root_view);
   if (!layout) {
     NOTREACHED();
-    return upgrade_util::DIALOG_ERROR;
+    return Upgrade::DIALOG_ERROR;
   }
   root_view->SetLayoutManager(layout);
 
   views::ColumnSet* columns;
   // First row: [icon][pad][text][button].
   columns = layout->AddColumnSet(0);
   columns->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
                      GridLayout::FIXED, icon_size.width(),
                      icon_size.height());
   columns->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
@@ skipping 29 matching lines @@
   columns->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                      GridLayout::USE_PREF, 0, 0);
   // First row views.
   layout->StartRow(0, 0);
   layout->AddView(icon);
 
   // Find out what experiment we are conducting.
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (!dist) {
     NOTREACHED() << "Cannot determine browser distribution";
-    return upgrade_util::DIALOG_ERROR;
+    return Upgrade::DIALOG_ERROR;
   }
   BrowserDistribution::UserExperiment experiment;
   if (!dist->GetExperimentDetails(&experiment, version_) ||
       !experiment.heading) {
     NOTREACHED() << "Cannot determine which headline to show.";
-    return upgrade_util::DIALOG_ERROR;
+    return Upgrade::DIALOG_ERROR;
   }
   string16 heading = l10n_util::GetStringUTF16(experiment.heading);
   views::Label* label = new views::Label(heading);
   label->SetFont(rb.GetFont(ResourceBundle::MediumBoldFont));
   label->SetMultiLine(true);
   label->SizeToFit(200);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   layout->AddView(label);
   // The close button is custom.
   views::ImageButton* close_button = new views::ImageButton(this);
@@ skipping 54 matching lines @@
   popup_->Show();
   MessageLoop::current()->Run();
   process_singleton->Unlock();
   return result_;
 }
 
 void TryChromeDialogView::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
   if (sender->tag() == BT_CLOSE_BUTTON) {
     // The user pressed cancel or the [x] button.
-    result_ = upgrade_util::NOT_NOW;
+    result_ = Upgrade::NOT_NOW;
   } else if (!try_chrome_) {
     // We don't have radio buttons, the user pressed ok.
-    result_ = upgrade_util::TRY_CHROME;
+    result_ = Upgrade::TRY_CHROME;
   } else {
     // The outcome is according to the selected ratio button.
-    result_ = try_chrome_->checked() ? upgrade_util::TRY_CHROME :
-                                       upgrade_util::UNINSTALL_CHROME;
+    result_ = try_chrome_->checked() ? Upgrade::TRY_CHROME :
+      Upgrade::UNINSTALL_CHROME;
   }
   popup_->Close();
   MessageLoop::current()->Quit();
 }
 
 void TryChromeDialogView::LinkActivated(views::Link* source, int event_flags) {
   ::ShellExecuteW(NULL, L"open", kHelpCenterUrl, NULL, NULL, SW_SHOW);
 }
 
 gfx::Rect TryChromeDialogView::ComputeWindowPosition(int width,
@@ skipping 17 matching lines @@
 
 void TryChromeDialogView::SetToastRegion(HWND window, int w, int h) {
   static const POINT polygon[] = {
     {0,   4}, {1,   2}, {2,   1}, {4, 0},   // Left side.
     {w-4, 0}, {w-2, 1}, {w-1, 2}, {w, 4},   // Right side.
     {w, h}, {0, h}
   };
   HRGN region = ::CreatePolygonRgn(polygon, arraysize(polygon), WINDING);
   ::SetWindowRgn(window, region, FALSE);
 }