chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 198063003: Revert of Shelf Cleanup (- binary files)

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/launcher/chrome_launcher_controller_browsertest.cc

Issue 198063003: Revert of Shelf Cleanup (- binary files) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

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

index 96d5c185921a50483f717b66787041eb30600f5f..38dbda858f702760edb73b5a7f31fb608a5820e6 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

@@ -11,7 +11,6 @@

#include "ash/display/display_controller.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_button.h"

-#include "ash/shelf/shelf_constants.h"

#include "ash/shelf/shelf_model.h"

#include "ash/shelf/shelf_util.h"

#include "ash/shelf/shelf_view.h"

@@ -822,7 +821,7 @@

EXPECT_TRUE(app_item_controller->image_set_by_controller());

EXPECT_TRUE(panel_item_controller->image_set_by_controller());

// Ensure icon heights are correct (see test.js in app_icon/ test directory)

- EXPECT_EQ(ash::kShelfSize, app_item.image.height());

+ EXPECT_EQ(48, app_item.image.height());

EXPECT_EQ(64, panel_item.image.height());

}