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

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

Issue 10979020: Revert r155813 "Reland - cros: Add chat icon to app list" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: not showing talk extension instead of fixing Created 8 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 | « no previous file | chrome/browser/ui/app_list/extension_app_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/apps_model_builder.cc
diff --git a/chrome/browser/ui/app_list/apps_model_builder.cc b/chrome/browser/ui/app_list/apps_model_builder.cc
index ccb6c3eda9c98b29255cd8d48870ed49d8483371..9f08c747ef1d21d128f97b8532ff1ed832023917 100644
--- a/chrome/browser/ui/app_list/apps_model_builder.cc
+++ b/chrome/browser/ui/app_list/apps_model_builder.cc
@@ -81,26 +81,6 @@ void AppsModelBuilder::PopulateApps() {
apps.push_back(new ExtensionAppItem(profile_, *app, controller_));
}
-#if defined(OS_CHROMEOS)
- // Explicitly add Talk extension if it's installed and enabled.
- // Add it here instead of in CreateSpecialApps() so it sorts naturally.
- // Prefer debug > alpha > beta > production version.
- const char* kTalkIds[] = {
- extension_misc::kTalkDebugExtensionId,
- extension_misc::kTalkAlphaExtensionId,
- extension_misc::kTalkBetaExtensionId,
- extension_misc::kTalkExtensionId,
- };
- for (size_t i = 0; i < arraysize(kTalkIds); ++i) {
- const Extension* talk = service->GetExtensionById(
- kTalkIds[i], false /*include_disabled*/);
- if (talk) {
- apps.push_back(new ExtensionAppItem(profile_, talk, controller_));
- break;
- }
- }
-#endif // OS_CHROMEOS
-
if (apps.empty())
return;
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/extension_app_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698