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

Unified Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.cc

Issue 7354023: Fix for memory leak bug 89144. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index 1aacaa078c1884b713b01ecaeabaeb81f9179394..616cceaa5b8e616e48af65ab0be67270a29b8463 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -290,7 +290,7 @@ void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) {
// The Cloud Print app should never be displayed in the NTP.
const Extension* extension = *it;
DictionaryValue* app_info = GetAppInfo(extension);
- if (app_info && ((*it)->id() != extension_misc::kCloudPrintAppId))
+ if (app_info)
list->Append(app_info);
}
@@ -345,7 +345,8 @@ DictionaryValue* AppLauncherHandler::GetAppInfo(const Extension* extension) {
bool ntp3 =
!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4);
if (!extension->is_app() ||
- (ntp3 && extension->id() == extension_misc::kWebStoreAppId)) {
+ (ntp3 && extension->id() == extension_misc::kWebStoreAppId) ||
+ (extension->id() == extension_misc::kCloudPrintAppId)) {
return NULL;
}
« no previous file with comments | « no previous file | tools/valgrind/memcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698