| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/chromeos/login/screenlock_icon_source.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 7 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| 8 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h" | 8 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h" |
| 9 #include "chrome/common/url_constants.h" | 9 #include "chrome/common/url_constants.h" |
| 10 #include "net/base/escape.h" | 10 #include "net/base/escape.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 std::string ScreenlockIconSource::GetSource() const { | 32 std::string ScreenlockIconSource::GetSource() const { |
| 33 return std::string(chrome::kChromeUIScreenlockIconHost); | 33 return std::string(chrome::kChromeUIScreenlockIconHost); |
| 34 } | 34 } |
| 35 | 35 |
| 36 void ScreenlockIconSource::StartDataRequest( | 36 void ScreenlockIconSource::StartDataRequest( |
| 37 const std::string& path, | 37 const std::string& path, |
| 38 int render_process_id, | 38 int render_process_id, |
| 39 int render_frame_id, | 39 int render_frame_id, |
| 40 const content::URLDataSource::GotDataCallback& callback) { | 40 const content::URLDataSource::GotDataCallback& callback) { |
| 41 if (!icon_provider_) { | 41 if (!icon_provider_) { |
| 42 callback.Run(GetDefaultIcon().As1xPNGBytes()); | 42 callback.Run(GetDefaultIcon().As1xPNGBytes().get()); |
| 43 return; | 43 return; |
| 44 } | 44 } |
| 45 | 45 |
| 46 GURL url(chrome::kChromeUIScreenlockIconURL + path); | 46 GURL url(chrome::kChromeUIScreenlockIconURL + path); |
| 47 std::string username = net::UnescapeURLComponent( | 47 std::string username = net::UnescapeURLComponent( |
| 48 url.path().substr(1), | 48 url.path().substr(1), |
| 49 net::UnescapeRule::URL_SPECIAL_CHARS | net::UnescapeRule::SPACES); | 49 net::UnescapeRule::URL_SPECIAL_CHARS | net::UnescapeRule::SPACES); |
| 50 | 50 |
| 51 gfx::Image image = icon_provider_->GetIcon(username); | 51 gfx::Image image = icon_provider_->GetIcon(username); |
| 52 if (image.IsEmpty()) { | 52 if (image.IsEmpty()) { |
| 53 callback.Run(GetDefaultIcon().As1xPNGBytes()); | 53 callback.Run(GetDefaultIcon().As1xPNGBytes().get()); |
| 54 return; | 54 return; |
| 55 } | 55 } |
| 56 | 56 |
| 57 callback.Run(image.As1xPNGBytes().get()); | 57 callback.Run(image.As1xPNGBytes().get()); |
| 58 } | 58 } |
| 59 | 59 |
| 60 std::string ScreenlockIconSource::GetMimeType(const std::string&) const { | 60 std::string ScreenlockIconSource::GetMimeType(const std::string&) const { |
| 61 return "image/png"; | 61 return "image/png"; |
| 62 } | 62 } |
| 63 | 63 |
| 64 // static. | 64 // static. |
| 65 std::string ScreenlockIconSource::GetIconURLForUser( | 65 std::string ScreenlockIconSource::GetIconURLForUser( |
| 66 const std::string& username) { | 66 const std::string& username) { |
| 67 return std::string(chrome::kChromeUIScreenlockIconURL) + | 67 return std::string(chrome::kChromeUIScreenlockIconURL) + |
| 68 net::EscapePath(username); | 68 net::EscapePath(username); |
| 69 } | 69 } |
| 70 | 70 |
| 71 } // namespace chromeos | 71 } // namespace chromeos |
| OLD | NEW |