OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/api/commands/commands_handler.h" | 5 #include "chrome/common/extensions/api/commands/commands_handler.h" |
6 | 6 |
7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/common/extensions/extension_manifest_constants.h" | 10 #include "chrome/common/extensions/extension_manifest_constants.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 bool CommandsHandler::AlwaysParseForType(Manifest::Type type) const { | 130 bool CommandsHandler::AlwaysParseForType(Manifest::Type type) const { |
131 return type == Manifest::TYPE_EXTENSION || | 131 return type == Manifest::TYPE_EXTENSION || |
132 type == Manifest::TYPE_LEGACY_PACKAGED_APP || | 132 type == Manifest::TYPE_LEGACY_PACKAGED_APP || |
133 type == Manifest::TYPE_PLATFORM_APP; | 133 type == Manifest::TYPE_PLATFORM_APP; |
134 } | 134 } |
135 | 135 |
136 void CommandsHandler::MaybeSetBrowserActionDefault(const Extension* extension, | 136 void CommandsHandler::MaybeSetBrowserActionDefault(const Extension* extension, |
137 CommandsInfo* info) { | 137 CommandsInfo* info) { |
138 if (extension->manifest()->HasKey(keys::kBrowserAction) && | 138 if (extension->manifest()->HasKey(keys::kBrowserAction) && |
139 !info->browser_action_command.get()) { | 139 !info->browser_action_command.get()) { |
140 info->browser_action_command.reset(new Command( | 140 info->browser_action_command.reset( |
141 extension_manifest_values::kBrowserActionCommandEvent, string16(), "")); | 141 new Command(extension_manifest_values::kBrowserActionCommandEvent, |
| 142 string16(), |
| 143 std::string())); |
142 } | 144 } |
143 } | 145 } |
144 | 146 |
145 const std::vector<std::string> CommandsHandler::Keys() const { | 147 const std::vector<std::string> CommandsHandler::Keys() const { |
146 return SingleKey(keys::kCommands); | 148 return SingleKey(keys::kCommands); |
147 } | 149 } |
148 | 150 |
149 } // namespace extensions | 151 } // namespace extensions |
OLD | NEW |