Get chrome to link with USE_AURA

chrome/browser/ui/views/about_chrome_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/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 87 matching lines @@
       chromium_url_(NULL),
       open_source_url_(NULL),
       terms_of_service_url_(NULL),
       restart_button_visible_(false),
       chromium_url_appears_first_(true),
       text_direction_is_rtl_(false) {
   DCHECK(profile);
 
   Init();
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   google_updater_ = new GoogleUpdate();
   google_updater_->set_status_listener(this);
 #endif
 
   if (kBackgroundBmp == NULL) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     kBackgroundBmp = rb.GetBitmapNamed(IDR_ABOUT_BACKGROUND_COLOR);
   }
 }
 
 AboutChromeView::~AboutChromeView() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
   // The Google Updater will hold a pointer to us until it reports status, so we
   // need to let it know that we will no longer be listening.
   if (google_updater_)
     google_updater_->set_status_listener(NULL);
 #endif
 }
 
 void AboutChromeView::Init() {
   text_direction_is_rtl_ = base::i18n::IsRTL();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ skipping 334 matching lines @@
     if (is_add) {
       parent->AddChildView(&update_label_);
       parent->AddChildView(throbber_.get());
       parent->AddChildView(&success_indicator_);
       success_indicator_.SetVisible(false);
       parent->AddChildView(&update_available_indicator_);
       update_available_indicator_.SetVisible(false);
       parent->AddChildView(&timeout_indicator_);
       timeout_indicator_.SetVisible(false);
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
       // On-demand updates for Chrome don't work in Vista RTM when UAC is turned
       // off. So, in this case we just want the About box to not mention
       // on-demand updates. Silent updates (in the background) should still
       // work as before - enabling UAC or installing the latest service pack
       // for Vista is another option.
       if (!(base::win::GetVersion() == base::win::VERSION_VISTA &&
             (base::win::OSInfo::GetInstance()->service_pack().major == 0) &&
             !base::win::UserAccountControlIsEnabled())) {
         UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR);
         // CheckForUpdate(false, ...) means don't upgrade yet.
@@ skipping 99 matching lines @@
   } else if (source == open_source_url_) {
     url = GURL(chrome::kChromeUICreditsURL);
   } else {
     NOTREACHED() << "Unknown link source";
   }
 
   Browser* browser = BrowserList::GetLastActive();
   browser->OpenURL(url, GURL(), NEW_WINDOW, PageTransition::LINK);
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 ////////////////////////////////////////////////////////////////////////////////
 // AboutChromeView, GoogleUpdateStatusListener implementation:
 
 void AboutChromeView::OnReportResults(GoogleUpdateUpgradeResult result,
                                       GoogleUpdateErrorCode error_code,
                                       const std::wstring& version) {
   // Drop the last reference to the object so that it gets cleaned up here.
   google_updater_ = NULL;
 
   // Make a note of which version Google Update is reporting is the latest
@@ skipping 125 matching lines @@
   // We have updated controls on the parent, so we need to update its layout.
   parent()->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the view hasn't been added to a Widget yet.
   if (GetWidget())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif