Chromium Code Reviews| Index: chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc |
| diff --git a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc |
| index 7f26aebf6837da738501491d471c22827472b5fa..7d1d512b9a95214096c586c9f3515af9bca32612 100644 |
| --- a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc |
| +++ b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc |
| @@ -42,6 +42,7 @@ const char kLastLaunchTime[] = "lastlaunchtime"; |
| const char kShouldSync[] = "should_sync"; |
| const char kSystem[] = "system"; |
| const char kOrientationLock[] = "orientation_lock"; |
| +const char kInstallTime[] = "install_time"; |
| constexpr int kSetNotificationsEnabledMinVersion = 6; |
| @@ -485,7 +486,7 @@ std::unique_ptr<ArcAppListPrefs::AppInfo> ArcAppListPrefs::GetApp( |
| return base::MakeUnique<AppInfo>( |
| name, package_name, activity, intent_uri, icon_resource_id, |
| - last_launch_time, sticky, notifications_enabled, |
| + last_launch_time, GetInstallTime(app_id), sticky, notifications_enabled, |
| ready_apps_.count(app_id) > 0, arc::ShouldShowInLauncher(app_id), |
| shortcut, orientation_lock); |
| } |
| @@ -622,6 +623,12 @@ void ArcAppListPrefs::AddAppAndShortcut( |
| app_dict->SetBoolean(kShortcut, shortcut); |
| app_dict->SetInteger(kOrientationLock, static_cast<int>(orientation_lock)); |
| + if (GetInstallTime(app_id).is_null()) { |
|
xiyuan
2016/08/08 18:02:14
nit: Document that |install_time| is the first tim
xdai1
2016/08/08 21:25:37
Done.
|
| + std::string install_time_str = |
| + base::Int64ToString(base::Time::Now().ToInternalValue()); |
| + app_dict->SetString(kInstallTime, install_time_str); |
| + } |
| + |
| // From now, app is available. |
| if (!ready_apps_.count(app_id)) |
| ready_apps_.insert(app_id); |
| @@ -630,10 +637,10 @@ void ArcAppListPrefs::AddAppAndShortcut( |
| FOR_EACH_OBSERVER(Observer, observer_list_, |
| OnAppReadyChanged(app_id, true)); |
| } else { |
| - AppInfo app_info(name, package_name, activity, intent_uri, icon_resource_id, |
| - base::Time(), sticky, notifications_enabled, true, |
| - arc::ShouldShowInLauncher(app_id), shortcut, |
| - orientation_lock); |
| + AppInfo app_info( |
| + name, package_name, activity, intent_uri, icon_resource_id, |
| + base::Time(), GetInstallTime(app_id), sticky, notifications_enabled, |
| + true, arc::ShouldShowInLauncher(app_id), shortcut, orientation_lock); |
| FOR_EACH_OBSERVER(Observer, |
| observer_list_, |
| OnAppRegistered(app_id, app_info)); |
| @@ -899,6 +906,22 @@ std::vector<std::string> ArcAppListPrefs::GetPackagesFromPrefs() const { |
| return packages; |
| } |
| +base::Time ArcAppListPrefs::GetInstallTime(const std::string& app_id) const { |
| + const base::DictionaryValue* app = nullptr; |
| + const base::DictionaryValue* apps = prefs_->GetDictionary(prefs::kArcApps); |
| + if (!apps || !apps->GetDictionaryWithoutPathExpansion(app_id, &app)) |
| + return base::Time(); |
| + |
| + std::string install_time_str; |
| + if (!app->GetString(kInstallTime, &install_time_str)) |
| + return base::Time(); |
| + |
| + int64_t install_time_i64; |
| + if (!base::StringToInt64(install_time_str, &install_time_i64)) |
| + return base::Time(); |
| + return base::Time::FromInternalValue(install_time_i64); |
| +} |
| + |
| void ArcAppListPrefs::InstallIcon(const std::string& app_id, |
| ui::ScaleFactor scale_factor, |
| const std::vector<uint8_t>& content_png) { |
| @@ -928,6 +951,7 @@ ArcAppListPrefs::AppInfo::AppInfo(const std::string& name, |
| const std::string& intent_uri, |
| const std::string& icon_resource_id, |
| const base::Time& last_launch_time, |
| + const base::Time& install_time, |
| bool sticky, |
| bool notifications_enabled, |
| bool ready, |
| @@ -940,6 +964,7 @@ ArcAppListPrefs::AppInfo::AppInfo(const std::string& name, |
| intent_uri(intent_uri), |
| icon_resource_id(icon_resource_id), |
| last_launch_time(last_launch_time), |
| + install_time(install_time), |
| sticky(sticky), |
| notifications_enabled(notifications_enabled), |
| ready(ready), |