| OLD | NEW |
| 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/api/extension_action/browser_action_handler.h
" | 5 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h
" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.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.h" | 10 #include "chrome/common/extensions/extension.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 scoped_ptr<ActionInfo> action_info = | 34 scoped_ptr<ActionInfo> action_info = |
| 35 manifest_handler_helpers::LoadActionInfo(extension, dict, error); | 35 manifest_handler_helpers::LoadActionInfo(extension, dict, error); |
| 36 if (!action_info.get()) | 36 if (!action_info.get()) |
| 37 return false; // Failed to parse browser action definition. | 37 return false; // Failed to parse browser action definition. |
| 38 | 38 |
| 39 ActionInfo::SetBrowserActionInfo(extension, action_info.release()); | 39 ActionInfo::SetBrowserActionInfo(extension, action_info.release()); |
| 40 | 40 |
| 41 return true; | 41 return true; |
| 42 } | 42 } |
| 43 | 43 |
| 44 const std::vector<std::string> BrowserActionHandler::Keys() const { |
| 45 return SingleKey(extension_manifest_keys::kBrowserAction); |
| 46 } |
| 47 |
| 44 } // namespace extensions | 48 } // namespace extensions |
| OLD | NEW |