Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5985)

Unified Diff: chrome/browser/ui/app_list/app_list_view_delegate.cc

Issue 2341113003: Remove deprecation warning banner from App Launcher code. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/app_list/app_list_view_delegate.h ('k') | ui/app_list/app_list_constants.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/app_list_view_delegate.cc
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
index 272c29a0b5334ab75c9e9d7f57f4237a1b18dd22..68e6871ca41bf650e5548d98d94dae1968820cd1 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -76,12 +76,6 @@
#include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
#endif
-#if !defined(OS_CHROMEOS)
-#include "chrome/grit/chromium_strings.h"
-#include "chrome/grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-#endif
-
namespace chrome {
const char kAppLauncherCategoryTag[] = "AppLauncher";
} // namespace chrome
@@ -728,43 +722,6 @@ void AppListViewDelegate::RemoveObserver(
observers_.RemoveObserver(observer);
}
-#if !defined(OS_CHROMEOS)
-base::string16 AppListViewDelegate::GetMessageTitle() const {
- return l10n_util::GetStringUTF16(IDS_APP_LIST_MESSAGE_TITLE);
-}
-
-base::string16 AppListViewDelegate::GetMessageText(
- size_t* message_break) const {
- return l10n_util::GetStringFUTF16(IDS_APP_LIST_MESSAGE_TEXT, base::string16(),
- message_break);
-}
-
-base::string16 AppListViewDelegate::GetAppsShortcutName() const {
- return l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME);
-}
-
-base::string16 AppListViewDelegate::GetLearnMoreText() const {
- return l10n_util::GetStringUTF16(IDS_APP_LIST_MESSAGE_LEARN_MORE_TEXT);
-}
-
-base::string16 AppListViewDelegate::GetLearnMoreLink() const {
- return l10n_util::GetStringUTF16(IDS_APP_LIST_MESSAGE_LEARN_MORE_LINK);
-}
-
-gfx::ImageSkia* AppListViewDelegate::GetAppsIcon() const {
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- // Ensure it's backed by a native image type in the ResourceBundle cache.
- rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_APPS_SHORTCUT);
- return rb.GetImageSkiaNamed(IDR_BOOKMARK_BAR_APPS_SHORTCUT);
-}
-
-void AppListViewDelegate::OpenLearnMoreLink() {
- controller_->OpenURL(profile_, GURL(GetLearnMoreLink()),
- ui::PAGE_TRANSITION_LINK,
- WindowOpenDisposition::CURRENT_TAB);
-}
-#endif // !defined(OS_CHROMEOS)
-
void AppListViewDelegate::OnTemplateURLServiceChanged() {
if (!app_list::switches::IsExperimentalAppListEnabled())
return;
« no previous file with comments | « chrome/browser/ui/app_list/app_list_view_delegate.h ('k') | ui/app_list/app_list_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698