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

Unified Diff: chrome/common/favicon/favicon_url_parser.cc

Issue 291733004: Reduce the use of ui::ScaleFactor in webui/favicon (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comments Created 6 years, 7 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
« no previous file with comments | « chrome/common/favicon/favicon_url_parser.h ('k') | chrome/common/favicon/favicon_url_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/favicon/favicon_url_parser.cc
diff --git a/chrome/common/favicon/favicon_url_parser.cc b/chrome/common/favicon/favicon_url_parser.cc
index 95f35a9f2a89aa4a2c72a421d1a69051534e1610..954bad87cc1ef689d80ecbe905113b1eac1c9b93 100644
--- a/chrome/common/favicon/favicon_url_parser.cc
+++ b/chrome/common/favicon/favicon_url_parser.cc
@@ -7,7 +7,6 @@
#include "base/strings/string_number_conversions.h"
#include "components/favicon_base/favicon_types.h"
#include "net/url_request/url_request.h"
-#include "ui/base/layout.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/gfx/favicon_size.h"
@@ -39,7 +38,7 @@ bool ParseFaviconPath(const std::string& path,
parsed->is_icon_url = false;
parsed->url = "";
parsed->size_in_dip = gfx::kFaviconSize;
- parsed->scale_factor = ui::SCALE_FACTOR_100P;
+ parsed->scale_factor = 1.0f;
parsed->path_index = -1;
if (path.empty())
@@ -77,7 +76,6 @@ bool ParseFaviconPath(const std::string& path,
// Only 64x64, 32x32 and 16x16 icons are supported.
parsed->size_in_dip = gfx::kFaviconSize;
}
-
if (!scale_str.empty())
webui::ParseScaleFactor(scale_str, &parsed->scale_factor);
« no previous file with comments | « chrome/common/favicon/favicon_url_parser.h ('k') | chrome/common/favicon/favicon_url_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698