trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome."

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: trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 7 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: trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

===================================================================

--- trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc (revision 269901)

+++ trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc (working copy)

@@ -79,13 +79,11 @@

const char* gmail_url = "https://mail.google.com/mail/u";

const char* kGmailLaunchURL = "https://mail.google.com/mail/ca";

-#if defined(OS_CHROMEOS)

// As defined in /chromeos/dbus/cryptohome_client.cc.

const char kUserIdHashSuffix[] = "-hash";

// An extension prefix.

const char kCrxAppPrefix[] = "_crx_";

-#endif

// ShelfModelObserver implementation that tracks what messages are invoked.

class TestShelfModelObserver : public ash::ShelfModelObserver {