| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/browser/ui/webui/settings_utils.h" | 5 #include "chrome/browser/ui/webui/settings_utils.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/extension_tab_util.h" | 7 #include "chrome/browser/extensions/extension_tab_util.h" |
| 8 #include "components/url_formatter/url_fixer.h" | 8 #include "components/url_formatter/url_fixer.h" |
| 9 #include "grit/theme_resources.h" |
| 10 #include "ui/base/resource/resource_bundle.h" |
| 9 #include "url/gurl.h" | 11 #include "url/gurl.h" |
| 10 | 12 |
| 11 namespace settings_utils { | 13 namespace settings_utils { |
| 12 | 14 |
| 13 bool FixupAndValidateStartupPage(const std::string& url_string, | 15 bool FixupAndValidateStartupPage(const std::string& url_string, |
| 14 GURL* fixed_url) { | 16 GURL* fixed_url) { |
| 15 GURL url = url_formatter::FixupURL(url_string, std::string()); | 17 GURL url = url_formatter::FixupURL(url_string, std::string()); |
| 16 bool valid = url.is_valid() && !extensions::ExtensionTabUtil::IsKillURL(url); | 18 bool valid = url.is_valid() && !extensions::ExtensionTabUtil::IsKillURL(url); |
| 17 if (valid && fixed_url) | 19 if (valid && fixed_url) |
| 18 fixed_url->Swap(&url); | 20 fixed_url->Swap(&url); |
| 19 return valid; | 21 return valid; |
| 20 } | 22 } |
| 21 | 23 |
| 24 base::RefCountedMemory* GetFaviconResourceBytes(ui::ScaleFactor scale_factor) { |
| 25 return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 26 IDR_SETTINGS_FAVICON, scale_factor); |
| 27 } |
| 28 |
| 22 } // namespace settings_utils | 29 } // namespace settings_utils |
| OLD | NEW |