chrome/browser/extensions/extension_browsertests_misc.cc - Issue 3145001: FBTF: Clean up task.h in x11_util.h and header usage in some delegates.

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

Issue 3145001: FBTF: Clean up task.h in x11_util.h and header usage in some delegates. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: more 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) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/ref_counted.h"	5 #include "base/ref_counted.h"

	6 #include "base/utf_string_conversions.h"

6 #include "chrome/browser/browser.h"	7 #include "chrome/browser/browser.h"

7 #include "chrome/browser/browser_list.h"	8 #include "chrome/browser/browser_list.h"

8 #include "chrome/browser/renderer_host/render_view_host.h"	9 #include "chrome/browser/renderer_host/render_view_host.h"

9 #include "chrome/browser/extensions/autoupdate_interceptor.h"	10 #include "chrome/browser/extensions/autoupdate_interceptor.h"

10 #include "chrome/browser/extensions/extension_apitest.h"	11 #include "chrome/browser/extensions/extension_apitest.h"

11 #include "chrome/browser/extensions/extension_browsertest.h"	12 #include "chrome/browser/extensions/extension_browsertest.h"

12 #include "chrome/browser/extensions/extension_error_reporter.h"	13 #include "chrome/browser/extensions/extension_error_reporter.h"

13 #include "chrome/browser/extensions/extension_host.h"	14 #include "chrome/browser/extensions/extension_host.h"

14 #include "chrome/browser/extensions/extension_process_manager.h"	15 #include "chrome/browser/extensions/extension_process_manager.h"

15 #include "chrome/browser/extensions/extension_tabs_module.h"	16 #include "chrome/browser/extensions/extension_tabs_module.h"

(...skipping 845 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
861	862

862 // If the options page hasn't already come up, wait for it.	863 // If the options page hasn't already come up, wait for it.

863 if (tab_strip->count() == 1) {	864 if (tab_strip->count() == 1) {

864 ui_test_utils::WaitForNewTab(browser());	865 ui_test_utils::WaitForNewTab(browser());

865 }	866 }

866 ASSERT_EQ(2, tab_strip->count());	867 ASSERT_EQ(2, tab_strip->count());

867	868

868 EXPECT_EQ(extension->GetResourceURL("options.html"),	869 EXPECT_EQ(extension->GetResourceURL("options.html"),

869 tab_strip->GetTabContentsAt(1)->GetURL());	870 tab_strip->GetTabContentsAt(1)->GetURL());

870 }	871 }

OLD	NEW