chrome/browser/extensions/extension_popup_apitest.cc - Issue 3129003: remove toolstrips

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/extensions/extension_popup_apitest.cc

Issue 3129003: remove toolstrips (Closed)

Patch Set: merge Created 10 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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "chrome/browser/extensions/extension_apitest.h"	6 #include "chrome/browser/extensions/extension_apitest.h"

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

8	8

9 // Flaky on windows. http://crbug.com/46601	9 // Flaky on windows. http://crbug.com/46601

10 #if defined(OS_WIN)	10 #if defined(OS_WIN)

11 #define MAYBE_Popup FLAKY_Popup	11 #define MAYBE_Popup FLAKY_Popup

12 #else	12 #else

13 #define MAYBE_Popup Popup	13 #define MAYBE_Popup Popup

14 #endif	14 #endif

15	15

16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Popup) {	16 // Disabled for some rewriting. http://crbug.com/51821

	17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Popup) {

17 CommandLine::ForCurrentProcess()->AppendSwitch(	18 CommandLine::ForCurrentProcess()->AppendSwitch(

18 switches::kEnableExperimentalExtensionApis);	19 switches::kEnableExperimentalExtensionApis);

19 CommandLine::ForCurrentProcess()->AppendSwitch(

20 switches::kEnableExtensionToolstrips);

21	20

22 ASSERT_TRUE(RunExtensionTest("popup")) << message_;	21 ASSERT_TRUE(RunExtensionTest("popup")) << message_;

23 }	22 }

OLD	NEW

« no previous file with comments | « chrome/browser/extensions/extension_popup_api.cc ('k') | chrome/browser/extensions/extension_prefs.cc » ('j') | no next file with comments »