chrome/browser/ui/webui/options2/options_ui_browsertest.cc - Issue 10698140: Remove "2" suffixes from options2 code.

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/browser/ui/webui/options2/options_ui_browsertest.cc

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 5 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

« no previous file with comments | « chrome/browser/ui/webui/options2/options_ui_browsertest.h ('k') | chrome/browser/ui/webui/options2/password_manager2_browsertest.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/browser/ui/webui/options2/options_ui2_browsertest.h"	5 #include "chrome/browser/ui/webui/options2/options_ui_browsertest.h"

6	6

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

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

9 #include "chrome/browser/ui/browser.h"	9 #include "chrome/browser/ui/browser.h"

10 #include "chrome/browser/ui/browser_tabstrip.h"	10 #include "chrome/browser/ui/browser_tabstrip.h"

11 #include "chrome/common/url_constants.h"	11 #include "chrome/common/url_constants.h"

12 #include "chrome/test/base/ui_test_utils.h"	12 #include "chrome/test/base/ui_test_utils.h"

13 #include "content/public/browser/web_contents.h"	13 #include "content/public/browser/web_contents.h"

14 #include "grit/generated_resources.h"	14 #include "grit/generated_resources.h"

15 #include "ui/base/l10n/l10n_util.h"	15 #include "ui/base/l10n/l10n_util.h"

(...skipping 26 matching lines...) Expand all Loading...
42 }	42 }

43	43

44 // Flaky, see http://crbug.com/119671.	44 // Flaky, see http://crbug.com/119671.

45 IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, FLAKY_LoadOptionsByURL) {	45 IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, FLAKY_LoadOptionsByURL) {

46 NavigateToSettings();	46 NavigateToSettings();

47 VerifyTitle();	47 VerifyTitle();

48 VerifyNavbar();	48 VerifyNavbar();

49 }	49 }

50	50

51 } // namespace options2	51 } // namespace options2

OLD	NEW