chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)

Patch Set: feedback Created 3 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

index 4553737db8cad7343f9a080af054049faa21ac48..2b83559f4ef87940991b86cae1da726e1c0e7594 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

@@ -6,7 +6,6 @@

#include <stddef.h>

-#include "ash/aura/wm_window_aura.h"

#include "ash/common/shelf/app_list_button.h"

#include "ash/common/shelf/shelf_button.h"

#include "ash/common/shelf/shelf_constants.h"

@@ -16,6 +15,7 @@

#include "ash/common/shelf/wm_shelf.h"

#include "ash/common/wm/window_state.h"

#include "ash/common/wm_shell.h"

+#include "ash/common/wm_window.h"

#include "ash/common/wm_window_property.h"

#include "ash/shell.h"

#include "ash/test/shelf_view_test_api.h"

@@ -372,7 +372,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {

DCHECK_GE(index, 0);

ash::ShelfItem item = model_->items()[index];

ash::WmShelf* shelf =

- ash::WmShelf::ForWindow(ash::WmWindowAura::Get(CurrentContext()));

+ ash::WmShelf::ForWindow(ash::WmWindow::Get(CurrentContext()));

std::unique_ptr<LauncherContextMenu> menu(

LauncherContextMenu::Create(controller_, &item, shelf));

return menu;

@@ -1910,7 +1910,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, MultiDisplayBasicDragAndDrop) {

DCHECK_EQ(ash::Shell::GetAllRootWindows().size(), 2U);

aura::Window* secondary_root_window = ash::Shell::GetAllRootWindows()[1];

ash::WmShelf* secondary_shelf =

- ash::WmShelf::ForWindow(ash::WmWindowAura::Get(secondary_root_window));

+ ash::WmShelf::ForWindow(ash::WmWindow::Get(secondary_root_window));

ui::test::EventGenerator generator(secondary_root_window, gfx::Point());

ash::test::ShelfViewTestAPI test(secondary_shelf->GetShelfViewForTesting());

@@ -2178,7 +2178,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, MatchingShelfIDandActiveTab) {

EXPECT_EQ(2, model_->item_count());

ash::WmWindow* window =

- ash::WmWindowAura::Get(browser()->window()->GetNativeWindow());

+ ash::WmWindow::Get(browser()->window()->GetNativeWindow());

int browser_index = GetIndexOfShelfItemType(ash::TYPE_BROWSER_SHORTCUT);

ash::ShelfID browser_id = model_->items()[browser_index].id;