chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 224113005: Eliminate ash::internal namespace

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 224113005: Eliminate ash::internal namespace (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/renderer_host/pepper/pepper_talk_host.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.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 aff474eeb04900f70849b1f599cc6ab3c032004c..34576c8afba19cef099000b1159657d259c7b751 100644

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

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

@@ -272,7 +272,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {

aura::test::EventGenerator* generator,

ash::test::ShelfViewTestAPI* test,

RipOffCommand command) {

- ash::internal::ShelfButton* button = test->GetButton(index);

+ ash::ShelfButton* button = test->GetButton(index);

gfx::Point start_point = button->GetBoundsInScreen().CenterPoint();

gfx::Point rip_off_point(start_point.x(), 0);

generator->MoveMouseTo(start_point.x(), start_point.y());

@@ -1774,8 +1774,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, DragOffShelf) {

GetIndexOfShelfItemType(ash::TYPE_BROWSER_SHORTCUT));

// Make sure that the hide state has been unset after the snap back animation

// finished.

- ash::internal::ShelfButton* button = test.GetButton(browser_index);

- EXPECT_FALSE(button->state() & ash::internal::ShelfButton::STATE_HIDDEN);

+ ash::ShelfButton* button = test.GetButton(browser_index);

+ EXPECT_FALSE(button->state() & ash::ShelfButton::STATE_HIDDEN);

// Test #2: Ripping out the application and canceling the operation should

// not change anything.