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

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

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/tabs/dock_info_aura.cc ('k') | chrome/browser/ui/views/about_chrome_view.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.h
===================================================================
--- chrome/browser/ui/views/about_chrome_view.h (revision 99983)
+++ chrome/browser/ui/views/about_chrome_view.h (working copy)
@@ -16,7 +16,7 @@
#include "views/view.h"
#include "views/window/dialog_delegate.h"
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
#include "chrome/browser/google/google_update.h"
#endif
@@ -36,7 +36,7 @@
////////////////////////////////////////////////////////////////////////////////
class AboutChromeView : public views::DialogDelegateView,
public views::LinkListener
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
, public GoogleUpdateStatusListener
#endif
{
@@ -75,7 +75,7 @@
// Overridden from views::LinkListener:
virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// Overridden from GoogleUpdateStatusListener:
virtual void OnReportResults(GoogleUpdateUpgradeResult result,
GoogleUpdateErrorCode error_code,
@@ -83,7 +83,7 @@
#endif
private:
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// Update the UI to show the status of the upgrade.
void UpdateStatus(GoogleUpdateUpgradeResult result,
GoogleUpdateErrorCode error_code);
@@ -128,7 +128,7 @@
// Determines the order of the two links we draw in the main label.
bool chromium_url_appears_first_;
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// The class that communicates with Google Update to find out if an update is
// available and asks it to start an upgrade.
scoped_refptr<GoogleUpdate> google_updater_;
« no previous file with comments | « chrome/browser/ui/tabs/dock_info_aura.cc ('k') | chrome/browser/ui/views/about_chrome_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698