chrome/browser/ui/ash/shelf_browsertest.cc - Issue 12313118: Refactor: Shelf Widget

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: chrome/browser/ui/ash/shelf_browsertest.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: safer shutdown (status_area_widget_) Created 7 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:

Index: chrome/browser/ui/ash/shelf_browsertest.cc

diff --git a/chrome/browser/ui/ash/shelf_browsertest.cc b/chrome/browser/ui/ash/shelf_browsertest.cc

index 36cd047eec1183dab73cf87bd26a6240450cb24d..ff3170be54cf49dca7f4cbcbd97aa3bdaca25b4e 100644

--- a/chrome/browser/ui/ash/shelf_browsertest.cc

+++ b/chrome/browser/ui/ash/shelf_browsertest.cc

@@ -3,8 +3,8 @@

// found in the LICENSE file.

#include "ash/root_window_controller.h"

+#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shell.h"

-#include "ash/wm/shelf_layout_manager.h"

#include "ash/wm/workspace_controller.h"

#include "base/utf_string_conversions.h"

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

@@ -18,7 +18,7 @@ typedef InProcessBrowserTest ShelfBrowserTest;

IN_PROC_BROWSER_TEST_F(ShelfBrowserTest, StatusBubble) {

ash::internal::ShelfLayoutManager* shelf =

ash::internal::RootWindowController::ForLauncher(

- browser()->window()->GetNativeWindow())->shelf();

+ browser()->window()->GetNativeWindow())->GetShelfLayoutManager();

EXPECT_TRUE(shelf->IsVisible());

// Ensure that the browser abuts the shelf.