OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/common/extensions/extension.h" | 5 #include "chrome/common/extensions/extension.h" |
6 | 6 |
7 #include "base/base64.h" | 7 #include "base/base64.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
532 if (location() == Manifest::COMPONENT && | 532 if (location() == Manifest::COMPONENT && |
533 !CommandLine::ForCurrentProcess()->HasSwitch( | 533 !CommandLine::ForCurrentProcess()->HasSwitch( |
534 switches::kShowComponentExtensionOptions)) { | 534 switches::kShowComponentExtensionOptions)) { |
535 return false; | 535 return false; |
536 } | 536 } |
537 | 537 |
538 // Always show unpacked extensions and apps. | 538 // Always show unpacked extensions and apps. |
539 if (Manifest::IsUnpackedLocation(location())) | 539 if (Manifest::IsUnpackedLocation(location())) |
540 return true; | 540 return true; |
541 | 541 |
| 542 // Don't show apps that aren't visible in either launcher or ntp. |
| 543 if (is_app() && !ShouldDisplayInAppLauncher() && !ShouldDisplayInNewTabPage()) |
| 544 return false; |
| 545 |
542 // Unless they are unpacked, never show hosted apps. Note: We intentionally | 546 // Unless they are unpacked, never show hosted apps. Note: We intentionally |
543 // show packaged apps and platform apps because there are some pieces of | 547 // show packaged apps and platform apps because there are some pieces of |
544 // functionality that are only available in chrome://extensions/ but which | 548 // functionality that are only available in chrome://extensions/ but which |
545 // are needed for packaged and platform apps. For example, inspecting | 549 // are needed for packaged and platform apps. For example, inspecting |
546 // background pages. See http://crbug.com/116134. | 550 // background pages. See http://crbug.com/116134. |
547 if (is_hosted_app()) | 551 if (is_hosted_app()) |
548 return false; | 552 return false; |
549 | 553 |
550 return true; | 554 return true; |
551 } | 555 } |
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1239 | 1243 |
1240 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( | 1244 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( |
1241 const Extension* extension, | 1245 const Extension* extension, |
1242 const PermissionSet* permissions, | 1246 const PermissionSet* permissions, |
1243 Reason reason) | 1247 Reason reason) |
1244 : reason(reason), | 1248 : reason(reason), |
1245 extension(extension), | 1249 extension(extension), |
1246 permissions(permissions) {} | 1250 permissions(permissions) {} |
1247 | 1251 |
1248 } // namespace extensions | 1252 } // namespace extensions |
OLD | NEW |