Index: chrome/browser/ui/views/frame/browser_view.cc |
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
index 02315365c5c41b5ad14f812f59950612443d65ef..2ceb7fd02a08a6213df3ef8493f5dd9adad2a718 100644 |
--- a/chrome/browser/ui/views/frame/browser_view.cc |
+++ b/chrome/browser/ui/views/frame/browser_view.cc |
@@ -136,6 +136,10 @@ |
#include "ui/base/view_prop.h" |
#endif |
+#if defined(OS_LINUX) && defined(USE_AURA) |
Ben Goodger (Google)
2011/10/26 19:06:04
Will this build & run on Windows too? If so, let's
mazda
2011/10/27 13:05:05
Done.
|
+#include "chrome/browser/ui/views/accelerator_table_linux.h" |
+#endif |
+ |
#if defined(TOUCH_UI) |
#include "chrome/browser/ui/touch/status_bubble_touch.h" |
#endif |
@@ -2299,7 +2303,7 @@ void BrowserView::ProcessFullscreen(bool fullscreen, |
} |
void BrowserView::LoadAccelerators() { |
-#if defined(USE_AURA) |
+#if defined(OS_WIN) && defined(USE_AURA) |
Ben Goodger (Google)
2011/10/26 19:06:04
same comment here.
I'd like to share as much in c
mazda
2011/10/27 13:05:05
Done.
|
// TODO(beng): |
NOTIMPLEMENTED(); |
#elif defined(OS_WIN) |