chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc - Issue 22793011: ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

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_per_browser_unittest.cc

Issue 22793011: ash:Shelf - Enable Alternate Shelf and Side Shelf by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 4 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

« ash/wm/workspace/workspace_layout_manager_unittest.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f91430bbcd41b6d94bcc0e59d300ad9031a49780..26654e5b6aca68bcbf1eb4e9e4860a4091bf016c 100644

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

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

@@ -8,6 +8,7 @@

#include <string>

#include <vector>

+#include "ash/ash_switches.h"

#include "ash/launcher/launcher_model.h"

#include "base/command_line.h"

#include "base/compiler_specific.h"

@@ -40,6 +41,8 @@ class ChromeLauncherControllerPerBrowserTest : public testing::Test {

ChromeLauncherControllerPerBrowserTest()

: profile_(new TestingProfile()),

extension_service_(NULL) {

+ CommandLine::ForCurrentProcess()->AppendSwitch(

Harry McCleave 2013/08/21 21:34:43 ChromeLaun...PerBrowser is being removed (cl in th

James Cook 2013/08/22 00:19:12 Just FYI: The original removal got reverted, but I

+ ash::switches::kAshDisableAlternateShelfLayout);

DictionaryValue manifest;

manifest.SetString("name", "launcher controller test extension");

manifest.SetString("version", "1");