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

Side by Side Diff: chrome/common/favicon/fallback_icon_url_parser.h

Issue 988863002: [Fallback icons] Change "explicit flow" interface so color hex strings don't use "#". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync. Created 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef CHROME_COMMON_FAVICON_FALLBACK_ICON_URL_PARSER_H_ 5 #ifndef CHROME_COMMON_FAVICON_FALLBACK_ICON_URL_PARSER_H_
6 #define CHROME_COMMON_FAVICON_FALLBACK_ICON_URL_PARSER_H_ 6 #define CHROME_COMMON_FAVICON_FALLBACK_ICON_URL_PARSER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 20 matching lines...) Expand all
31 bool Parse(const std::string& path); 31 bool Parse(const std::string& path);
32 32
33 private: 33 private:
34 // Parses |specs_str|, which should be the comma-separated value portion 34 // Parses |specs_str|, which should be the comma-separated value portion
35 // in the format described at the top of the file 35 // in the format described at the top of the file
36 // "chrome/browser/ui/webui/fallback_icon_source.h". 36 // "chrome/browser/ui/webui/fallback_icon_source.h".
37 static bool ParseSpecs(const std::string& specs_str, 37 static bool ParseSpecs(const std::string& specs_str,
38 int *size, 38 int *size,
39 favicon_base::FallbackIconStyle* style); 39 favicon_base::FallbackIconStyle* style);
40 40
41 // Helper to parse color string (e.g., "red", "#f00", "#fF0000"). Returns true 41 // Helper to parse color string (e.g., "red", "#f00", "#aB0137"). On success,
42 // on success. 42 // returns true and writes te result to |*color|.
43 static bool ParseColor(const std::string& color_str, SkColor* color); 43 static bool ParseColor(const std::string& color_str, SkColor* color);
44 44
45 friend class FallbackIconUrlParserTest; 45 friend class FallbackIconUrlParserTest;
46 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseColorSuccess); 46 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseColorSuccess);
47 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseColorFailure); 47 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseColorFailure);
48 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseSpecsEmpty); 48 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseSpecsEmpty);
49 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseSpecsPartial); 49 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseSpecsPartial);
50 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseSpecsFull); 50 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseSpecsFull);
51 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseSpecsFailure); 51 FRIEND_TEST_ALL_PREFIXES(FallbackIconUrlParserTest, ParseSpecsFailure);
52 52
53 // The page URL the fallback icon is requested for. 53 // The page URL the fallback icon is requested for.
54 GURL url_; 54 GURL url_;
55 55
56 // The size of the requested fallback icon in pixels. 56 // The size of the requested fallback icon in pixels.
57 int size_in_pixels_; 57 int size_in_pixels_;
58 58
59 // Styling specifications of fallback icon. 59 // Styling specifications of fallback icon.
60 favicon_base::FallbackIconStyle style_; 60 favicon_base::FallbackIconStyle style_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(ParsedFallbackIconPath); 62 DISALLOW_COPY_AND_ASSIGN(ParsedFallbackIconPath);
63 }; 63 };
64 64
65 } // namespace chrome 65 } // namespace chrome
66 66
67 #endif // CHROME_COMMON_FAVICON_FALLBACK_ICON_URL_PARSER_H_ 67 #endif // CHROME_COMMON_FAVICON_FALLBACK_ICON_URL_PARSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/fallback_icon_source.h ('k') | chrome/common/favicon/fallback_icon_url_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698