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

Unified Diff: ash/wm/switchable_windows.cc

Issue 2861243003: chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager (Closed)
Patch Set: feedback Created 3 years, 7 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/wm/switchable_windows.h ('k') | ash/wm/workspace/workspace_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/switchable_windows.cc
diff --git a/ash/wm/switchable_windows.cc b/ash/wm/switchable_windows.cc
index a82e3dd672174a531c2338ef0c97205d6585c76a..29ea174353759c46dc3f3e0231a8817a66735966 100644
--- a/ash/wm/switchable_windows.cc
+++ b/ash/wm/switchable_windows.cc
@@ -5,7 +5,6 @@
#include "ash/wm/switchable_windows.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm_window.h"
#include "ui/aura/window.h"
namespace ash {
@@ -18,10 +17,10 @@ const int kSwitchableWindowContainerIds[] = {
const size_t kSwitchableWindowContainerIdsLength =
arraysize(kSwitchableWindowContainerIds);
-bool IsSwitchableContainer(const WmWindow* window) {
+bool IsSwitchableContainer(const aura::Window* window) {
if (!window)
return false;
- const int shell_window_id = window->aura_window()->id();
+ const int shell_window_id = window->id();
for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) {
if (shell_window_id == kSwitchableWindowContainerIds[i])
return true;
« no previous file with comments | « ash/wm/switchable_windows.h ('k') | ash/wm/workspace/workspace_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698