Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(614)

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifests_ui_unittest.cc

Issue 12042096: Move page action manifest parsing out of Extension; the first multi-key manifest handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
OLDNEW
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"
6
7 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h " 5 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h "
6 #include "chrome/common/extensions/api/extension_action/page_action_handler.h"
8 #include "chrome/common/extensions/extension_manifest_constants.h" 7 #include "chrome/common/extensions/extension_manifest_constants.h"
9 #include "chrome/common/extensions/manifest_handler.h" 8 #include "chrome/common/extensions/manifest_handler.h"
9 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 11
12 namespace extensions { 12 namespace extensions {
13 13
14 class UIManifestTest : public ExtensionManifestTest { 14 class UIManifestTest : public ExtensionManifestTest {
15 protected: 15 protected:
16 virtual void SetUp() OVERRIDE { 16 virtual void SetUp() OVERRIDE {
17 ManifestHandler::Register(extension_manifest_keys::kBrowserAction, 17 ManifestHandler::Register(extension_manifest_keys::kBrowserAction,
18 make_linked_ptr(new BrowserActionHandler)); 18 make_linked_ptr(new BrowserActionHandler));
19 linked_ptr<extensions::PageActionHandler> page_action_handler(
20 new extensions::PageActionHandler);
21 extensions::ManifestHandler::Register(
22 extension_manifest_keys::kPageAction, page_action_handler);
23 extensions::ManifestHandler::Register(
24 extension_manifest_keys::kPageActions, page_action_handler);
19 } 25 }
20 }; 26 };
21 27
22 TEST_F(UIManifestTest, DisallowMultipleUISurfaces) { 28 TEST_F(UIManifestTest, DisallowMultipleUISurfaces) {
23 LoadAndExpectError("multiple_ui_surfaces.json", 29 LoadAndExpectError("multiple_ui_surfaces.json",
24 extension_manifest_errors::kOneUISurfaceOnly); 30 extension_manifest_errors::kOneUISurfaceOnly);
25 } 31 }
26 32
27 } // namespace extensions 33 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698