chrome/test/ui/ui_perf_test.cc - Issue 7171005: Always support locating Chromium-branded builds.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/test/ui/ui_perf_test.cc

Issue 7171005: Always support locating Chromium-branded builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: disable chrome switching in UIPerfTest and PageCyclerReferenceTest Created 9 years, 6 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/test/ui/ui_perf_test.h"	5 #include "chrome/test/ui/ui_perf_test.h"

6	6

7 #include "base/path_service.h"	7 #include "base/path_service.h"

8 #include "base/string_number_conversions.h"	8 #include "base/string_number_conversions.h"

9 #include "chrome/common/chrome_paths.h"	9 #include "chrome/common/chrome_paths.h"

10 #include "chrome/common/chrome_switches.h"	10 #include "chrome/common/chrome_switches.h"

(...skipping 314 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
325 FilePath dir;	325 FilePath dir;

326 PathService::Get(chrome::DIR_TEST_TOOLS, &dir);	326 PathService::Get(chrome::DIR_TEST_TOOLS, &dir);

327 dir = dir.AppendASCII("reference_build");	327 dir = dir.AppendASCII("reference_build");

328 #if defined(OS_WIN)	328 #if defined(OS_WIN)

329 dir = dir.AppendASCII("chrome");	329 dir = dir.AppendASCII("chrome");

330 #elif defined(OS_LINUX)	330 #elif defined(OS_LINUX)

331 dir = dir.AppendASCII("chrome_linux");	331 dir = dir.AppendASCII("chrome_linux");

332 #elif defined(OS_MACOSX)	332 #elif defined(OS_MACOSX)

333 dir = dir.AppendASCII("chrome_mac");	333 dir = dir.AppendASCII("chrome_mac");

334 #endif	334 #endif

	335 enable_chrome_branding_ = false;

335 SetBrowserDirectory(dir);	336 SetBrowserDirectory(dir);

336 }	337 }

OLD	NEW

« no previous file with comments | « chrome/test/page_cycler/page_cycler_test.cc ('k') | chrome/test/ui/ui_test.h » ('j') | no next file with comments »