ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc - Issue 2035543004: Shuffles and renames ash/common/wm classes

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: ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

Issue 2035543004: Shuffles and renames ash/common/wm classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: random changes for chrome tests Created 4 years, 6 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

« ash/common/wm_window.h ('K') | « ash/system/web_notification/ash_popup_alignment_delegate.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

index 99ef2c8578ed791c9ad8dc3f7c436508deb33727..8fd22a93a48ed8a50daba3204f7e990092193146 100644

--- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

+++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

@@ -8,9 +8,9 @@

#include <vector>

#include "ash/common/shell_window_ids.h"

-#include "ash/common/wm/wm_globals.h"

-#include "ash/common/wm/wm_root_window_controller.h"

-#include "ash/common/wm/wm_window.h"

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

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

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

#include "ash/display/display_manager.h"

#include "ash/screen_util.h"

#include "ash/shelf/shelf.h"

@@ -107,7 +107,7 @@ class AshPopupAlignmentDelegateTest : public test::AshTestBase {

views::Widget::InitParams params;

params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;

params.bounds = gfx::Rect(0, 0, 50, 50);

- wm::WmGlobals::Get()

+ WmShell::Get()

->GetPrimaryRootWindow()

->GetRootWindowController()

->ConfigureWidgetInitParamsForContainer(widget.get(), container_id,

« ash/common/wm_window.h ('K') | « ash/system/web_notification/ash_popup_alignment_delegate.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »