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

Unified Diff: chrome/browser/ui/ash/accelerator_commands_browsertest.cc

Issue 1921883002: Removes WindowState::aura_window() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows build Created 4 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
Index: chrome/browser/ui/ash/accelerator_commands_browsertest.cc
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
index 9932528454c48130cba4563ac6c7ca09c03947e8..5ae2ede28c625a947d523d2360b9dc1cb512cec3 100644
--- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -6,6 +6,7 @@
#include "ash/ash_switches.h"
#include "ash/shell.h"
+#include "ash/wm/aura/wm_window_aura.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/command_line.h"
@@ -80,7 +81,8 @@ IN_PROC_BROWSER_TEST_F(AcceleratorCommandsBrowserTest, ToggleMaximized) {
// When in fullscreen accelerators::ToggleMaximized gets out of fullscreen.
EXPECT_FALSE(window_state->IsFullscreen());
- Browser* browser = chrome::FindBrowserWithWindow(window_state->aura_window());
+ Browser* browser = chrome::FindBrowserWithWindow(
+ ash::wm::WmWindowAura::GetAuraWindow(window_state->window()));
ASSERT_TRUE(browser);
chrome::ToggleFullscreenMode(browser);
EXPECT_TRUE(window_state->IsFullscreen());
@@ -153,8 +155,8 @@ IN_PROC_BROWSER_TEST_P(AcceleratorCommandsFullscreenBrowserTest,
// 2) ToggleFullscreen() should have no effect on windows which cannot be
// maximized.
- window_state->aura_window()->SetProperty(aura::client::kCanMaximizeKey,
- false);
+ ash::wm::WmWindowAura::GetAuraWindow(window_state->window())
+ ->SetProperty(aura::client::kCanMaximizeKey, false);
ash::accelerators::ToggleFullscreen();
EXPECT_TRUE(IsInitialShowState(window_state));
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698