| 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/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/common/extensions/extension_file_util.h" | |
| 11 #include "extensions/common/extension.h" | 10 #include "extensions/common/extension.h" |
| 12 #include "extensions/common/feature_switch.h" | 11 #include "extensions/common/feature_switch.h" |
| 12 #include "extensions/common/file_util.h" |
| 13 #include "extensions/common/manifest.h" | 13 #include "extensions/common/manifest.h" |
| 14 #include "extensions/common/manifest_constants.h" | 14 #include "extensions/common/manifest_constants.h" |
| 15 #include "grit/generated_resources.h" | 15 #include "grit/generated_resources.h" |
| 16 | 16 |
| 17 namespace extensions { | 17 namespace extensions { |
| 18 | 18 |
| 19 BrowserActionHandler::BrowserActionHandler() { | 19 BrowserActionHandler::BrowserActionHandler() { |
| 20 } | 20 } |
| 21 | 21 |
| 22 BrowserActionHandler::~BrowserActionHandler() { | 22 BrowserActionHandler::~BrowserActionHandler() { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 return true; | 40 return true; |
| 41 } | 41 } |
| 42 | 42 |
| 43 bool BrowserActionHandler::Validate( | 43 bool BrowserActionHandler::Validate( |
| 44 const Extension* extension, | 44 const Extension* extension, |
| 45 std::string* error, | 45 std::string* error, |
| 46 std::vector<InstallWarning>* warnings) const { | 46 std::vector<InstallWarning>* warnings) const { |
| 47 const ActionInfo* action = ActionInfo::GetBrowserActionInfo(extension); | 47 const ActionInfo* action = ActionInfo::GetBrowserActionInfo(extension); |
| 48 if (action && !action->default_icon.empty() && | 48 if (action && !action->default_icon.empty() && |
| 49 !extension_file_util::ValidateExtensionIconSet( | 49 !file_util::ValidateExtensionIconSet( |
| 50 action->default_icon, | 50 action->default_icon, |
| 51 extension, | 51 extension, |
| 52 IDS_EXTENSION_LOAD_ICON_FOR_BROWSER_ACTION_FAILED, | 52 IDS_EXTENSION_LOAD_ICON_FOR_BROWSER_ACTION_FAILED, |
| 53 error)) { | 53 error)) { |
| 54 return false; | 54 return false; |
| 55 } | 55 } |
| 56 return true; | 56 return true; |
| 57 } | 57 } |
| 58 | 58 |
| 59 const std::vector<std::string> BrowserActionHandler::Keys() const { | 59 const std::vector<std::string> BrowserActionHandler::Keys() const { |
| 60 return SingleKey(manifest_keys::kBrowserAction); | 60 return SingleKey(manifest_keys::kBrowserAction); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace extensions | 63 } // namespace extensions |
| OLD | NEW |