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

Unified Diff: chrome/browser/extensions/api/extension_action/extension_action_api.cc

Issue 214243003: Remove some chrome dependencies from extensions app_window API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/extension_action/extension_action_api.cc
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
index d4c600704b62a7356203dc0d68e0a696a5dceff4..d3f003e2ae769296288ade11c250853c5b6ad2db 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
@@ -28,6 +28,7 @@
#include "extensions/browser/extension_function_registry.h"
#include "extensions/browser/extension_host.h"
#include "extensions/browser/extension_system.h"
+#include "extensions/browser/image_util.h"
#include "extensions/common/error_utils.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image.h"
@@ -647,38 +648,6 @@ void ExtensionActionFunction::NotifySystemIndicatorChange() {
content::Details<ExtensionAction>(extension_action_));
}
-// static
-bool ExtensionActionFunction::ParseCSSColorString(
- const std::string& color_string,
- SkColor* result) {
- std::string formatted_color;
- // Check the string for incorrect formatting.
- if (color_string.empty() || color_string[0] != '#')
- return false;
-
- // Convert the string from #FFF format to #FFFFFF format.
- if (color_string.length() == 4) {
- for (size_t i = 1; i < 4; ++i) {
- formatted_color += color_string[i];
- formatted_color += color_string[i];
- }
- } else if (color_string.length() == 7) {
- formatted_color = color_string.substr(1, 6);
- } else {
- return false;
- }
-
- // Convert the string to an integer and make sure it is in the correct value
- // range.
- std::vector<uint8> color_bytes;
- if (!base::HexStringToBytes(formatted_color, &color_bytes))
- return false;
-
- DCHECK_EQ(3u, color_bytes.size());
- *result = SkColorSetARGB(255, color_bytes[0], color_bytes[1], color_bytes[2]);
- return true;
-}
-
bool ExtensionActionFunction::SetVisible(bool visible) {
if (extension_action_->GetIsVisible(tab_id_) == visible)
return true;
@@ -786,7 +755,7 @@ bool ExtensionActionSetBadgeBackgroundColorFunction::RunExtensionAction() {
} else if (color_value->IsType(base::Value::TYPE_STRING)) {
std::string color_string;
EXTENSION_FUNCTION_VALIDATE(details_->GetString("color", &color_string));
- if (!ParseCSSColorString(color_string, &color))
+ if (!image_util::ParseCSSColorString(color_string, &color))
return false;
}

Powered by Google App Engine
This is Rietveld 408576698