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

Side by Side Diff: chrome/browser/ui/ash/shelf_browsertest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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/session_util.cc ('k') | chrome/browser/ui/ash/system_tray_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/shelf/shelf_layout_manager.h" 5 #include "ash/shelf/shelf_layout_manager.h"
6 #include "ash/common/shelf/wm_shelf.h" 6 #include "ash/shelf/wm_shelf.h"
7 #include "ash/common/wm_window.h" 7 #include "ash/wm_window.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
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/session_util.cc ('k') | chrome/browser/ui/ash/system_tray_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698