| 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/shelf/shelf.h" | 5 #include "ash/shelf/shelf.h" |
| 6 #include "ash/shelf/shelf_layout_manager.h" | 6 #include "ash/shelf/shelf_layout_manager.h" |
| 7 #include "ash/wm_window.h" | |
| 8 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| 12 #include "chrome/browser/ui/status_bubble.h" | 11 #include "chrome/browser/ui/status_bubble.h" |
| 13 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
| 15 #include "chromeos/chromeos_switches.h" | 14 #include "chromeos/chromeos_switches.h" |
| 16 #include "components/user_manager/user_names.h" | 15 #include "components/user_manager/user_names.h" |
| 17 | 16 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 } | 55 } |
| 57 }; | 56 }; |
| 58 | 57 |
| 59 // Tests that in guest session, shelf alignment could be initialized to bottom | 58 // Tests that in guest session, shelf alignment could be initialized to bottom |
| 60 // aligned, instead of bottom locked (crbug.com/699661). | 59 // aligned, instead of bottom locked (crbug.com/699661). |
| 61 IN_PROC_BROWSER_TEST_F(ShelfGuestSessionBrowserTest, ShelfAlignment) { | 60 IN_PROC_BROWSER_TEST_F(ShelfGuestSessionBrowserTest, ShelfAlignment) { |
| 62 ash::Shelf* shelf = | 61 ash::Shelf* shelf = |
| 63 ash::Shelf::ForWindow(browser()->window()->GetNativeWindow()); | 62 ash::Shelf::ForWindow(browser()->window()->GetNativeWindow()); |
| 64 EXPECT_EQ(ash::SHELF_ALIGNMENT_BOTTOM, shelf->alignment()); | 63 EXPECT_EQ(ash::SHELF_ALIGNMENT_BOTTOM, shelf->alignment()); |
| 65 } | 64 } |
| OLD | NEW |