chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc - Issue 10911300: Move ExtensionAction from common/ to browser/.

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

Unified Diff: chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc

Issue 10911300: Move ExtensionAction from common/ to browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: proof of concept 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 side-by-side diff with in-line comments

Download patch

« chrome/common/extensions/extension.h ('K') | « chrome/common/extensions/extension_unittest.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc

diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc

index fccc493a84879ef4bcc21cfbb837f49084e5b6b5..4972e4f1a3528f70da5383b3bdfb527907137b38 100644

--- a/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc

+++ b/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc

@@ -4,7 +4,6 @@

#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"

-#include "chrome/common/extensions/extension_action.h"

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

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

@@ -16,12 +15,10 @@ TEST_F(ExtensionManifestTest, PageActionManifestVersion2) {

ASSERT_TRUE(extension.get());

ASSERT_TRUE(extension->page_action());

- EXPECT_EQ("", extension->page_action()->id());

- EXPECT_EQ(0u, extension->page_action()->icon_paths()->size());

- EXPECT_EQ("", extension->page_action()->GetTitle(

- ExtensionAction::kDefaultTabId));

- EXPECT_FALSE(extension->page_action()->HasPopup(

- ExtensionAction::kDefaultTabId));

+ EXPECT_EQ("", extension->page_action()->id);

+ EXPECT_EQ("", extension->page_action()->default_icon_path);

+ EXPECT_EQ("", extension->page_action()->default_title);

+ EXPECT_TRUE(extension->page_action()->default_popup_url.is_empty());

LoadAndExpectError("page_action_manifest_version_2b.json",

errors::kInvalidPageActionPopup);