| 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 ff189f858e412d38a47a4ef66e7a2c8a8d96b330..2b330895c986bfd3b2fb77df8ec11a531274b9c9 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
|
| @@ -18,13 +18,11 @@
|
| #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
|
| #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h"
|
| #include "chrome/common/pref_names.h"
|
| -#include "chrome/grit/generated_resources.h"
|
| #include "components/arc/arc_bridge_service.h"
|
| #include "components/crx_file/id_util.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/prefs/scoped_user_pref_update.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "ui/base/l10n/l10n_util.h"
|
|
|
| namespace {
|
|
|
| @@ -701,29 +699,20 @@ void ArcAppListPrefs::AddAppAndShortcut(
|
| const arc::mojom::OrientationLock orientation_lock) {
|
| const std::string app_id = shortcut ? GetAppId(package_name, intent_uri)
|
| : GetAppId(package_name, activity);
|
| -
|
| - // |updated_name| will be only used on M53 and will be reverted later on Tot.
|
| - std::string updated_name = name;
|
| - if (app_id == arc::kPlayStoreAppId) {
|
| - updated_name =
|
| - name + " (" +
|
| - l10n_util::GetStringUTF8(IDS_ABOUT_PAGE_CURRENT_CHANNEL_BETA) + ")";
|
| - }
|
| -
|
| const bool was_registered = IsRegistered(app_id);
|
| if (was_registered) {
|
| std::unique_ptr<ArcAppListPrefs::AppInfo> app_old_info = GetApp(app_id);
|
| DCHECK(app_old_info);
|
| DCHECK(launchable);
|
| - if (updated_name != app_old_info->name) {
|
| + if (name != app_old_info->name) {
|
| FOR_EACH_OBSERVER(Observer, observer_list_,
|
| - OnAppNameUpdated(app_id, updated_name));
|
| + OnAppNameUpdated(app_id, name));
|
| }
|
| }
|
|
|
| ScopedArcPrefUpdate update(prefs_, app_id, prefs::kArcApps);
|
| base::DictionaryValue* app_dict = update.Get();
|
| - app_dict->SetString(kName, updated_name);
|
| + app_dict->SetString(kName, name);
|
| app_dict->SetString(kPackageName, package_name);
|
| app_dict->SetString(kActivity, activity);
|
| app_dict->SetString(kIntentUri, intent_uri);
|
| @@ -753,9 +742,9 @@ void ArcAppListPrefs::AddAppAndShortcut(
|
| OnAppReadyChanged(app_id, true));
|
| }
|
| } else {
|
| - AppInfo app_info(updated_name, package_name, activity, intent_uri,
|
| - icon_resource_id, base::Time(), GetInstallTime(app_id),
|
| - sticky, notifications_enabled, true,
|
| + AppInfo app_info(name, package_name, activity, intent_uri, icon_resource_id,
|
| + base::Time(), GetInstallTime(app_id), sticky,
|
| + notifications_enabled, true,
|
| launchable && arc::ShouldShowInLauncher(app_id), shortcut,
|
| launchable, orientation_lock);
|
| FOR_EACH_OBSERVER(Observer,
|
|
|