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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 8341050: Aura: Support non-global keyboard shortcuts. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: '' Created 9 years, 2 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 | « no previous file | views/view.cc » ('j') | views/view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « no previous file | views/view.cc » ('j') | views/view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698