chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc - Issue 11644057: Move BrowserAction out of Extension

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/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc

Issue 11644057: Move BrowserAction out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_ungoop_extension_action

Patch Set: Combined ActionInfo wrappers Created 7 years, 12 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

« chrome/common/extensions/api/extension_action/action_info.h ('K') | « chrome/common/extensions/manifest_tests/extension_manifests_browseraction_unittest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc » ('j') | chrome/renderer/extensions/page_actions_custom_bindings.cc » ('J')
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/common/extensions/manifest_tests/extension_manifest_test.h"	5 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"

6	6

	7 #include "chrome/common/extensions/api/extension_action/action_info.h"
	Yoyo Zhou 2012/12/28 05:19:59 Is this used? Is this used? Devlin 2012/12/28 20:25:36 Yeah, on lines 18 - 23, we access page_action_info Show quoted text On 2012/12/28 05:19:59, Yoyo Zhou wrote: > Is this used? Yeah, on lines 18 - 23, we access page_action_info()->*. Previously, it relied on transitive includes for both Extension and ActionInfo.
	8 #include "chrome/common/extensions/extension.h"

7 #include "chrome/common/extensions/extension_manifest_constants.h"	9 #include "chrome/common/extensions/extension_manifest_constants.h"

8 #include "testing/gtest/include/gtest/gtest.h"	10 #include "testing/gtest/include/gtest/gtest.h"

9	11

10 namespace errors = extension_manifest_errors;	12 namespace errors = extension_manifest_errors;

11	13

12 TEST_F(ExtensionManifestTest, PageActionManifestVersion2) {	14 TEST_F(ExtensionManifestTest, PageActionManifestVersion2) {

13 scoped_refptr<extensions::Extension> extension(	15 scoped_refptr<extensions::Extension> extension(

14 LoadAndExpectSuccess("page_action_manifest_version_2.json"));	16 LoadAndExpectSuccess("page_action_manifest_version_2.json"));

15 ASSERT_TRUE(extension.get());	17 ASSERT_TRUE(extension.get());

16 ASSERT_TRUE(extension->page_action_info());	18 ASSERT_TRUE(extension->page_action_info());

17	19

18 EXPECT_EQ("", extension->page_action_info()->id);	20 EXPECT_EQ("", extension->page_action_info()->id);

19 EXPECT_TRUE(extension->page_action_info()->default_icon.empty());	21 EXPECT_TRUE(extension->page_action_info()->default_icon.empty());

20 EXPECT_EQ("", extension->page_action_info()->default_title);	22 EXPECT_EQ("", extension->page_action_info()->default_title);

21 EXPECT_TRUE(extension->page_action_info()->default_popup_url.is_empty());	23 EXPECT_TRUE(extension->page_action_info()->default_popup_url.is_empty());

22	24

23 LoadAndExpectError("page_action_manifest_version_2b.json",	25 LoadAndExpectError("page_action_manifest_version_2b.json",

24 errors::kInvalidPageActionPopup);	26 errors::kInvalidPageActionPopup);

25 }	27 }

OLD	NEW