diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 02:06:01 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 02:06:01 +0000 |
| commit | 4a6bef33b6897ceff27eee304afe1a6da5fee4ff (patch) | |
| tree | 64c7e2cb508ccbe6a9e50be1da7c99b016ea5b52 /views/metrics_aura.cc | |
| parent | ccb824344b58ae4acbc0b7b30ebcba048a032836 (diff) | |
| download | chromium_src-4a6bef33b6897ceff27eee304afe1a6da5fee4ff.zip chromium_src-4a6bef33b6897ceff27eee304afe1a6da5fee4ff.tar.gz chromium_src-4a6bef33b6897ceff27eee304afe1a6da5fee4ff.tar.bz2 | |
aura: A few changes to have aura_demo compile and run on linux.
* Make 'aura' a component, and export Desktop and Window.
* Events (Key and Mouse) from X Events.
* Rip non-gtk bits out of gfx/gtk_util into gfx/linux_util
BUG=93934,93933
TEST=none
Review URL: http://codereview.chromium.org/7833016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/metrics_aura.cc')
| -rw-r--r-- | views/metrics_aura.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/views/metrics_aura.cc b/views/metrics_aura.cc index 6c8fef4..46fb9b9 100644 --- a/views/metrics_aura.cc +++ b/views/metrics_aura.cc @@ -4,7 +4,9 @@ #include "views/metrics.h" +#if defined(OS_WIN) #include <windows.h> +#endif namespace views { @@ -24,7 +26,7 @@ int GetMenuShowDelay() { return delay; #else return 0; -#endif; +#endif } } // namespace views |