diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/chromeos/notifications/system_notification.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/chromeos/notifications/system_notification.cc')
| -rw-r--r-- | chrome/browser/chromeos/notifications/system_notification.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/notifications/system_notification.cc b/chrome/browser/chromeos/notifications/system_notification.cc index 83debd5..f83c414 100644 --- a/chrome/browser/chromeos/notifications/system_notification.cc +++ b/chrome/browser/chromeos/notifications/system_notification.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/notifications/system_notification.h" #include "base/callback.h" -#include "base/move.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/notifications/system_notification_factory.h" #include "chrome/browser/dom_ui/dom_ui_util.h" @@ -14,15 +13,17 @@ namespace chromeos { -SystemNotification::SystemNotification(Profile* profile, std::string id, - int icon_resource_id, string16 title) - : profile_(profile), - collection_(static_cast<BalloonCollectionImpl*>( - g_browser_process->notification_ui_manager()->balloon_collection())), - delegate_(new Delegate(base::move(id))), - title_(move(title)), - visible_(false), - urgent_(false) { +SystemNotification::SystemNotification(Profile* profile, + const std::string& id, + int icon_resource_id, + const string16& title) + : profile_(profile), + collection_(static_cast<BalloonCollectionImpl*>( + g_browser_process->notification_ui_manager()->balloon_collection())), + delegate_(new Delegate(id)), + title_(title), + visible_(false), + urgent_(false) { std::string url = dom_ui_util::GetImageDataUrlFromResource(icon_resource_id); DCHECK(!url.empty()); GURL tmp_gurl(url); |