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

Unified Diff: ash/shell.cc

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: Fix special index 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/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index b889e0bcd720e29e2b6116a56d212dbd026c2a7c..16a44ad751ab9ece52fe4c26e2c7e70f190ee9d0 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -11,6 +11,7 @@
#include "ash/app_list/app_list.h"
#include "ash/ash_switches.h"
#include "ash/drag_drop/drag_drop_controller.h"
+#include "ash/focus_cycler.h"
#include "ash/ime/input_method_event_filter.h"
#include "ash/launcher/launcher.h"
#include "ash/shell_delegate.h"
@@ -297,6 +298,11 @@ void Shell::Init() {
if (!command_line->HasSwitch(switches::kAuraNoShadows))
shadow_controller_.reset(new internal::ShadowController());
+ focus_cycler_.reset(new FocusCycler());
+ focus_cycler_->AddWidget(status_widget_);
+ if (!IsWindowModeCompact())
+ focus_cycler_->AddWidget(launcher_->widget());
+
// Force a layout.
root_window->layout_manager()->OnWindowResized();
@@ -418,6 +424,10 @@ views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
return NULL;
}
+void Shell::RotateFocus(bool forwards) {
+ focus_cycler_->RotateFocus(forwards);
+}
+
////////////////////////////////////////////////////////////////////////////////
// Shell, private:

Powered by Google App Engine
This is Rietveld 408576698