chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. Created 4 years, 4 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

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

6 #include "ash/common/shelf/shelf_view.h"	7 #include "ash/common/shelf/shelf_view.h"

7 #include "ash/shelf/shelf.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "ash/test/shelf_test_api.h"	9 #include "ash/test/shelf_test_api.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/location.h"	11 #include "base/location.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "base/message_loop/message_loop.h"	13 #include "base/message_loop/message_loop.h"

14 #include "base/run_loop.h"	14 #include "base/run_loop.h"

15 #include "base/single_thread_task_runner.h"	15 #include "base/single_thread_task_runner.h"

16 #include "base/threading/thread_task_runner_handle.h"	16 #include "base/threading/thread_task_runner_handle.h"

17 #include "build/build_config.h"	17 #include "build/build_config.h"

(...skipping 182 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
200	200

201 CloseBrowser(browser_list->get(0));	201 CloseBrowser(browser_list->get(0));

202 OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]);	202 OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]);

203	203

204 // Next new browser must be created on 1st display.	204 // Next new browser must be created on 1st display.

205 ASSERT_EQ(1u, browser_list->size());	205 ASSERT_EQ(1u, browser_list->size());

206 EXPECT_EQ(root_windows[0],	206 EXPECT_EQ(root_windows[0],

207 browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());	207 browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());

208 EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());	208 EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());

209 }	209 }

OLD	NEW