Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3524)

Unified Diff: chrome/browser/ui/views/about_chrome_view.cc

Issue 7841012: Get chrome to link with USE_AURA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/about_chrome_view.h ('k') | chrome/browser/ui/views/browser_bubble_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/about_chrome_view.cc
===================================================================
--- chrome/browser/ui/views/about_chrome_view.cc (revision 99983)
+++ chrome/browser/ui/views/about_chrome_view.cc (working copy)
@@ -105,7 +105,7 @@
Init();
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
google_updater_ = new GoogleUpdate();
google_updater_->set_status_listener(this);
#endif
@@ -117,7 +117,7 @@
}
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_)
@@ -472,7 +472,7 @@
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
@@ -592,7 +592,7 @@
browser->OpenURL(url, GURL(), NEW_WINDOW, PageTransition::LINK);
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
////////////////////////////////////////////////////////////////////////////////
// AboutChromeView, GoogleUpdateStatusListener implementation:
« no previous file with comments | « chrome/browser/ui/views/about_chrome_view.h ('k') | chrome/browser/ui/views/browser_bubble_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698