chrome/browser/extensions/options_page_apitest.cc - Issue 12379095: Fix up unused includes from chrome/browser/extensions to the rest of chrome/browser.

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/options_page_apitest.cc

Issue 12379095: Fix up unused includes from chrome/browser/extensions to the rest of chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: other platforms Created 7 years, 9 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) 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/extensions/extension_browsertest.h"	5 #include "chrome/browser/extensions/extension_browsertest.h"

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

7 #include "chrome/browser/extensions/extension_system.h"	7 #include "chrome/browser/extensions/extension_system.h"

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

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

10 #include "chrome/browser/ui/tabs/tab_strip_model.h"	9 #include "chrome/browser/ui/tabs/tab_strip_model.h"

11 #include "chrome/common/extensions/extension.h"	10 #include "chrome/common/extensions/extension.h"

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

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

14 #include "content/public/browser/notification_service.h"	13 #include "content/public/browser/notification_service.h"

15 #include "content/public/test/browser_test_utils.h"	14 #include "content/public/test/browser_test_utils.h"

16	15

17 using extensions::Extension;	16 using extensions::Extension;

18	17

19 // Used to simulate a click on the first element named 'Options'.	18 // Used to simulate a click on the first element named 'Options'.

(...skipping 28 matching lines...) Expand all Loading...
48 EXPECT_TRUE(content::ExecuteScriptInFrame(	47 EXPECT_TRUE(content::ExecuteScriptInFrame(

49 tab_strip->GetActiveWebContents(),	48 tab_strip->GetActiveWebContents(),

50 "//iframe[starts-with(@src, 'chrome://extension')]",	49 "//iframe[starts-with(@src, 'chrome://extension')]",

51 kScriptClickOptionButton));	50 kScriptClickOptionButton));

52 observer.Wait();	51 observer.Wait();

53 EXPECT_EQ(2, tab_strip->count());	52 EXPECT_EQ(2, tab_strip->count());

54	53

55 EXPECT_EQ(extension->GetResourceURL("options.html"),	54 EXPECT_EQ(extension->GetResourceURL("options.html"),

56 tab_strip->GetWebContentsAt(1)->GetURL());	55 tab_strip->GetWebContentsAt(1)->GetURL());

57 }	56 }

OLD	NEW