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

Unified Diff: ash/common/focus_cycler.cc

Issue 2798333005: Moves WmWindow::GetInternalWidget() into a standalone function (Closed)
Patch Set: Created 3 years, 8 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 | « ash/common/devtools/ash_devtools_unittest.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/focus_cycler.cc
diff --git a/ash/common/focus_cycler.cc b/ash/common/focus_cycler.cc
index 653f23c13cd2c66059012f361a318486c12f64f9..6a31eca89aeed6c8f5c5927fb9c14b8bb8b52ffc 100644
--- a/ash/common/focus_cycler.cc
+++ b/ash/common/focus_cycler.cc
@@ -9,6 +9,7 @@
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
+#include "ash/wm/widget_finder.h"
#include "ash/wm/window_util.h"
#include "ui/views/accessible_pane_view.h"
#include "ui/views/focus/focus_search.h"
@@ -42,7 +43,7 @@ void FocusCycler::RemoveWidget(views::Widget* widget) {
void FocusCycler::RotateFocus(Direction direction) {
WmWindow* window = WmWindow::Get(wm::GetActiveWindow());
if (window) {
- views::Widget* widget = window->GetInternalWidget();
+ views::Widget* widget = GetInternalWidgetForWindow(window->aura_window());
// First try to rotate focus within the active widget. If that succeeds,
// we're done.
if (widget &&
@@ -87,7 +88,7 @@ void FocusCycler::RotateFocus(Direction direction) {
break;
WmWindow* window = mru_windows.front();
window->GetWindowState()->Activate();
- views::Widget* widget = window->GetInternalWidget();
+ views::Widget* widget = GetInternalWidgetForWindow(window->aura_window());
if (!widget)
break;
views::FocusManager* focus_manager = widget->GetFocusManager();
« no previous file with comments | « ash/common/devtools/ash_devtools_unittest.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698