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

Unified Diff: ash/launcher/launcher_view.h

Issue 9295049: Allow focus to be sent between browser window and launcher/status window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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
Index: ash/launcher/launcher_view.h
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index 4e41be5ea00bfb83297dd00a406002c54a1a1742..e943630ddd65bec828871fbbf8fbc09479610c29 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -92,6 +92,7 @@ class LauncherView : public views::WidgetDelegateView,
// Overridden from views::View:
virtual gfx::Size GetPreferredSize() OVERRIDE;
virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
// Overridden from LauncherModelObserver:
virtual void LauncherItemAdded(int model_index) OVERRIDE;
@@ -143,6 +144,9 @@ class LauncherView : public views::WidgetDelegateView,
scoped_ptr<views::MenuRunner> overflow_menu_runner_;
#endif
+ ui::Accelerator ctrl_forward_key_;
+ ui::Accelerator ctrl_back_key_;
+
// Used to handle cycling among windows.
scoped_ptr<LauncherWindowCycler> cycler_;

Powered by Google App Engine
This is Rietveld 408576698