chrome/browser/ui/ash/shelf_browsertest.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/ash/shelf_browsertest.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/ash/multi_user/user_switch_animator_chromeos.cc ('k') | chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/shelf/shelf.h"	6 #include "ash/common/shelf/shelf.h"

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

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "chrome/browser/ui/browser.h"	9 #include "chrome/browser/ui/browser.h"

10 #include "chrome/browser/ui/browser_window.h"	10 #include "chrome/browser/ui/browser_window.h"

11 #include "chrome/browser/ui/status_bubble.h"	11 #include "chrome/browser/ui/status_bubble.h"

12 #include "chrome/test/base/in_process_browser_test.h"	12 #include "chrome/test/base/in_process_browser_test.h"

13	13

14 typedef InProcessBrowserTest ShelfBrowserTest;	14 typedef InProcessBrowserTest ShelfBrowserTest;

15	15

16 // Confirm that a status bubble doesn't cause the shelf to darken.	16 // Confirm that a status bubble doesn't cause the shelf to darken.

17 IN_PROC_BROWSER_TEST_F(ShelfBrowserTest, StatusBubble) {	17 IN_PROC_BROWSER_TEST_F(ShelfBrowserTest, StatusBubble) {

(...skipping 15 matching lines...) Expand all Loading...
33 shelf_layout_manager->UpdateVisibilityState();	33 shelf_layout_manager->UpdateVisibilityState();

34	34

35 // Ensure that status doesn't cause overlap.	35 // Ensure that status doesn't cause overlap.

36 EXPECT_FALSE(shelf_layout_manager->window_overlaps_shelf());	36 EXPECT_FALSE(shelf_layout_manager->window_overlaps_shelf());

37	37

38 // Ensure that moving the browser slightly down does cause overlap.	38 // Ensure that moving the browser slightly down does cause overlap.

39 bounds.Offset(0, 1);	39 bounds.Offset(0, 1);

40 browser()->window()->SetBounds(bounds);	40 browser()->window()->SetBounds(bounds);

41 EXPECT_TRUE(shelf_layout_manager->window_overlaps_shelf());	41 EXPECT_TRUE(shelf_layout_manager->window_overlaps_shelf());

42 }	42 }

OLD	NEW