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

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

Issue 7253001: Added a private chromeAuthPrivate API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unittest failure Created 9 years, 6 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/resources/cloud_print_app/manifest.json ('k') | chrome/chrome_browser.gypi » ('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 5ca61e37459c936c1ca81edb469c2ad7397015f4..abf809463a08ba323fed2e872d3769ed7f4615f7 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -226,10 +226,12 @@ void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) {
const ExtensionList* extensions = extensions_service_->extensions();
ExtensionList::const_iterator it;
for (it = extensions->begin(); it != extensions->end(); ++it) {
- // Don't include the WebStore.
+ // Don't include the WebStore and the Cloud Print app.
// The WebStore launcher gets special treatment in ntp/apps.js.
+ // The Cloud Print app should not be displayed in the NTP.
if ((*it)->is_app() &&
- (*it)->id() != extension_misc::kWebStoreAppId) {
+ (*it)->id() != extension_misc::kWebStoreAppId &&
+ (*it)->id() != extension_misc::kCloudPrintAppId) {
DictionaryValue* app_info = new DictionaryValue();
CreateAppInfo(*it, extensions_service_->extension_prefs(), app_info);
list->Append(app_info);
@@ -239,7 +241,8 @@ void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) {
extensions = extensions_service_->disabled_extensions();
for (it = extensions->begin(); it != extensions->end(); ++it) {
if ((*it)->is_app() &&
- (*it)->id() != extension_misc::kWebStoreAppId) {
+ (*it)->id() != extension_misc::kWebStoreAppId &&
+ (*it)->id() != extension_misc::kCloudPrintAppId) {
DictionaryValue* app_info = new DictionaryValue();
CreateAppInfo(*it, extensions_service_->extension_prefs(), app_info);
list->Append(app_info);
« no previous file with comments | « chrome/browser/resources/cloud_print_app/manifest.json ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698