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

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

Issue 180783012: Media Keys should not count towards the max of four shortcuts per extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move IsMediaKey from c/b/e/a/c/command_service.h &&.cc to c/c/e/command.h && .cc Created 6 years, 9 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"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 LoadAndExpectSuccess("command_ext.json"); 125 LoadAndExpectSuccess("command_ext.json");
126 scoped_refptr<Extension> extension2 = 126 scoped_refptr<Extension> extension2 =
127 LoadAndExpectSuccess("command_app.json"); 127 LoadAndExpectSuccess("command_app.json");
128 scoped_refptr<Extension> extension3 = 128 scoped_refptr<Extension> extension3 =
129 LoadAndExpectSuccess("command_ext_global.json"); 129 LoadAndExpectSuccess("command_ext_global.json");
130 scoped_refptr<Extension> extension4 = 130 scoped_refptr<Extension> extension4 =
131 LoadAndExpectSuccess("command_app_global.json"); 131 LoadAndExpectSuccess("command_app_global.json");
132 } 132 }
133 } 133 }
134 134
135 TEST_F(CommandsManifestTest, CommandManifestShouldNotCountMediaKeys) {
136 scoped_refptr<Extension> extension =
137 LoadAndExpectSuccess("command_should_not_count_media_keys.json");
138 }
139
135 } // namespace extensions 140 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/commands/commands_handler.cc ('k') | chrome/common/extensions/command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698