chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc - Issue 10891044: RestoreTabHelper > SessionTabHelper, move more session stuff into it.

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/api/extension_action/page_as_browser_action_apitest.cc

Issue 10891044: RestoreTabHelper > SessionTabHelper, move more session stuff into it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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 "base/command_line.h"	5 #include "base/command_line.h"

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

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

8 #include "chrome/browser/extensions/extension_prefs.h"	8 #include "chrome/browser/extensions/extension_prefs.h"

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

10 #include "chrome/browser/extensions/extension_tab_util.h"	10 #include "chrome/browser/extensions/extension_tab_util.h"

11 #include "chrome/browser/profiles/profile.h"	11 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/sessions/restore_tab_helper.h"

13 #include "chrome/browser/ui/browser.h"	12 #include "chrome/browser/ui/browser.h"

14 #include "chrome/browser/ui/browser_tabstrip.h"	13 #include "chrome/browser/ui/browser_tabstrip.h"

15 #include "chrome/browser/ui/browser_window.h"	14 #include "chrome/browser/ui/browser_window.h"

16 #include "chrome/browser/ui/omnibox/location_bar.h"	15 #include "chrome/browser/ui/omnibox/location_bar.h"

17 #include "chrome/browser/ui/tab_contents/tab_contents.h"	16 #include "chrome/browser/ui/tab_contents/tab_contents.h"

18 #include "chrome/common/chrome_switches.h"	17 #include "chrome/common/chrome_switches.h"

19 #include "chrome/common/extensions/extension.h"	18 #include "chrome/common/extensions/extension.h"

20 #include "chrome/common/extensions/extension_action.h"	19 #include "chrome/common/extensions/extension_action.h"

21 #include "chrome/test/base/ui_test_utils.h"	20 #include "chrome/test/base/ui_test_utils.h"

22 #include "content/public/browser/web_contents.h"	21 #include "content/public/browser/web_contents.h"

(...skipping 156 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
179 const Extension* extension = GetSingleLoadedExtension();	178 const Extension* extension = GetSingleLoadedExtension();

180 ASSERT_TRUE(extension) << message_;	179 ASSERT_TRUE(extension) << message_;

181	180

182 ResultCatcher catcher;	181 ResultCatcher catcher;

183 ui_test_utils::NavigateToURL(browser(),	182 ui_test_utils::NavigateToURL(browser(),

184 GURL(extension->GetResourceURL("update.html")));	183 GURL(extension->GetResourceURL("update.html")));

185 ASSERT_TRUE(catcher.GetNextResult());	184 ASSERT_TRUE(catcher.GetNextResult());

186 }	185 }

187	186

188 }	187 }

OLD	NEW