diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 19:39:52 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 19:39:52 +0000 |
| commit | 9d43e371e6c0b70b938575690f561f3742ad8397 (patch) | |
| tree | c81e3799f4a55ca713e86d673ccdf94fc1641dc1 /views/accelerator.cc | |
| parent | 5b5e1e2f5f30d1f4eaf5a1ae4ae95a7ccc2eab7b (diff) | |
| download | chromium_src-9d43e371e6c0b70b938575690f561f3742ad8397.zip chromium_src-9d43e371e6c0b70b938575690f561f3742ad8397.tar.gz chromium_src-9d43e371e6c0b70b938575690f561f3742ad8397.tar.bz2 | |
These are the changes necessary for views to be able to build w/ use_aura implying no gtk.
BUG=97131
TEST=views_unittests
Review URL: http://codereview.chromium.org/7996008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.cc')
| -rw-r--r-- | views/accelerator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/accelerator.cc b/views/accelerator.cc index 79c72cb..41a953d 100644 --- a/views/accelerator.cc +++ b/views/accelerator.cc @@ -6,7 +6,7 @@ #if defined(OS_WIN) #include <windows.h> -#elif defined(OS_LINUX) +#elif defined(TOOLKIT_USES_GTK) #include <gdk/gdk.h> #endif @@ -83,7 +83,7 @@ string16 Accelerator::GetShortcutText() const { else key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR)); shortcut += key; -#elif defined(OS_LINUX) +#elif defined(TOOLKIT_USES_GTK) const gchar* name = NULL; switch (key_code_) { case ui::VKEY_OEM_2: |