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

Side by Side Diff: chrome/common/extensions/api/commands/commands_manifest_unittest.cc

Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 7 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
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" 5 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/common/extensions/api/commands/commands_handler.h" 10 #include "chrome/common/extensions/api/commands/commands_handler.h"
11 #include "extensions/common/manifest_constants.h"
11 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
12 13
13 namespace errors = extension_manifest_errors; 14 namespace extensions {
14 15
15 namespace extensions { 16 namespace errors = manifest_errors;
16 17
17 class CommandsManifestTest : public ExtensionManifestTest { 18 class CommandsManifestTest : public ExtensionManifestTest {
18 }; 19 };
19 20
20 TEST_F(CommandsManifestTest, CommandManifestSimple) { 21 TEST_F(CommandsManifestTest, CommandManifestSimple) {
21 #if defined(OS_MACOSX) 22 #if defined(OS_MACOSX)
22 int ctrl = ui::EF_COMMAND_DOWN; 23 int ctrl = ui::EF_COMMAND_DOWN;
23 #else 24 #else
24 int ctrl = ui::EF_CONTROL_DOWN; 25 int ctrl = ui::EF_CONTROL_DOWN;
25 #endif 26 #endif
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 LoadAndExpectSuccess("browser_action_synthesizes_command.json"); 87 LoadAndExpectSuccess("browser_action_synthesizes_command.json");
87 // An extension with a browser action but no extension command specified 88 // An extension with a browser action but no extension command specified
88 // should get a command assigned to it. 89 // should get a command assigned to it.
89 const extensions::Command* command = 90 const extensions::Command* command =
90 CommandsInfo::GetBrowserActionCommand(extension.get()); 91 CommandsInfo::GetBrowserActionCommand(extension.get());
91 ASSERT_TRUE(command != NULL); 92 ASSERT_TRUE(command != NULL);
92 ASSERT_EQ(ui::VKEY_UNKNOWN, command->accelerator().key_code()); 93 ASSERT_EQ(ui::VKEY_UNKNOWN, command->accelerator().key_code());
93 } 94 }
94 95
95 } // namespace extensions 96 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698