ash/shelf/shelf_tooltip_manager_unittest.cc - Issue 115113006: Rename Launcher to Shelf.

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: ash/shelf/shelf_tooltip_manager_unittest.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more fixes Created 7 years 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: ash/shelf/shelf_tooltip_manager_unittest.cc

diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc

index 6114202c9f6b8412aea1bd6952c4c9a269f673ee..2294ba4613c0fcfb941dc60b42813e798b39ef4c 100644

--- a/ash/shelf/shelf_tooltip_manager_unittest.cc

+++ b/ash/shelf/shelf_tooltip_manager_unittest.cc

@@ -10,7 +10,7 @@

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

#include "ash/test/ash_test_base.h"

-#include "ash/test/launcher_test_api.h"

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

#include "ash/wm/window_util.h"

#include "base/strings/string16.h"

#include "base/time/time.h"

@@ -46,7 +46,7 @@ class ShelfTooltipManagerTest : public AshTestBase {

Shell::GetPrimaryRootWindowController();

tooltip_manager_.reset(new internal::ShelfTooltipManager(

controller->GetShelfLayoutManager(),

- LauncherTestAPI(controller->shelf()->launcher()).shelf_view()));

+ ShelfTestAPI(controller->shelf()->shelf()).shelf_view()));

}

virtual void TearDown() OVERRIDE {

« no previous file with comments | « ash/shelf/shelf_navigator_unittest.cc ('k') | ash/shelf/shelf_unittest.cc » ('j') | no next file with comments »