chromeos: Make Chrome app a real app.

chrome/common/extensions/extension.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
 
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 78 matching lines @@
 
 const int kRSAKeySize = 1024;
 
 const char kDefaultContentSecurityPolicy[] =
     "script-src 'self' chrome-extension-resource:; object-src 'self'";
 
 #define PLATFORM_APP_LOCAL_CSP_SOURCES \
     "'self' blob: data: filesystem: chrome-extension-resource:"
 const char kDefaultPlatformAppContentSecurityPolicy[] =
     // Platform apps can only use local resources by default.
-   "default-src 'self' chrome-extension-resource:;"
-   // For remote resources, they can fetch them via XMLHttpRequest.
-   "connect-src *;"
-   // And serve them via blob:, data: or filesystem: URLs
-   "style-src " PLATFORM_APP_LOCAL_CSP_SOURCES " 'unsafe-inline';"
-   "img-src " PLATFORM_APP_LOCAL_CSP_SOURCES ";"
-   "frame-src " PLATFORM_APP_LOCAL_CSP_SOURCES ";"
-   "font-src " PLATFORM_APP_LOCAL_CSP_SOURCES ";"
-   // Media can be loaded from remote resources since:
-   // 1. <video> and <audio> have good fallback behavior when offline or under
-   //    spotty connectivity.
-   // 2. Fetching via XHR and serving via blob: URLs currently does not allow
-   //    streaming or partial buffering.
-   "media-src *;";
+    "default-src 'self' chrome-extension-resource:;"
+    // For remote resources, they can fetch them via XMLHttpRequest.
+    "connect-src *;"
+    // And serve them via blob:, data: or filesystem: URLs
+    "style-src " PLATFORM_APP_LOCAL_CSP_SOURCES " 'unsafe-inline';"
+    "img-src " PLATFORM_APP_LOCAL_CSP_SOURCES ";"
+    "frame-src " PLATFORM_APP_LOCAL_CSP_SOURCES ";"
+    "font-src " PLATFORM_APP_LOCAL_CSP_SOURCES ";"
+    // Media can be loaded from remote resources since:
+    // 1. <video> and <audio> have good fallback behavior when offline or under
+    //    spotty connectivity.
+    // 2. Fetching via XHR and serving via blob: URLs currently does not allow
+    //    streaming or partial buffering.
+    "media-src *;";
 
 const char kDefaultSandboxedPageContentSecurityPolicy[] =
     "sandbox allow-scripts allow-forms";
 
 // Converts a normal hexadecimal string into the alphabet used by extensions.
 // We use the characters 'a'-'p' instead of '0'-'f' to avoid ever having a
 // completely numeric host, since some software interprets that as an IP
 // address.
 static void ConvertHexadecimalToIDAlphabet(std::string* id) {
   for (size_t i = 0; i < id->size(); ++i) {
@@ skipping 645 matching lines @@
 
   return true;
 }
 
 bool Extension::LoadGlobsHelper(
     const DictionaryValue* content_script,
     int content_script_index,
     const char* globs_property_name,
     string16* error,
     void(UserScript::*add_method)(const std::string& glob),
-    UserScript *instance) {
+    UserScript* instance) {
   if (!content_script->HasKey(globs_property_name))
     return true;  // they are optional
 
   ListValue* list = NULL;
   if (!content_script->GetList(globs_property_name, &list)) {
     *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
         errors::kInvalidGlobList,
         base::IntToString(content_script_index),
         globs_property_name);
     return false;
@@ skipping 457 matching lines @@
         switches::kCloudPrintServiceURL));
     if (!cloud_print_service_url.is_empty()) {
       std::string path(
           cloud_print_service_url.path() + "/enable_chrome_connector");
       GURL::Replacements replacements;
       replacements.SetPathStr(path);
       GURL cloud_print_enable_connector_url =
           cloud_print_service_url.ReplaceComponents(replacements);
       OverrideLaunchUrl(cloud_print_enable_connector_url);
     }
+  } else if (id() == extension_misc::kChromeAppId) {
+    // Override launch url to new tab.
+    launch_web_url_ = chrome::kChromeUINewTabURL;
+    extent_.ClearPatterns();
   }
 
   return true;
 }
 
 bool Extension::LoadLaunchContainer(string16* error) {
   Value* temp = NULL;
   if (!manifest_->Get(keys::kLaunchContainer, &temp))
     return true;
 
@@ skipping 2428 matching lines @@
 
 bool Extension::ShouldDisplayInLauncher() const {
   // All apps should be displayed on the NTP except for the Cloud Print App.
   return is_app() && id() != extension_misc::kCloudPrintAppId;
 }
 
 bool Extension::InstallWarning::operator==(const InstallWarning& other) const {
   return format == other.format && message == other.message;
 }
 
-void PrintTo(const Extension::InstallWarning& warning, ::std::ostream* os){
+void PrintTo(const Extension::InstallWarning& warning, ::std::ostream* os) {
   *os << "InstallWarning(";
   switch (warning.format) {
     case Extension::InstallWarning::FORMAT_TEXT:
       *os << "FORMAT_TEXT, \"";
       break;
     case Extension::InstallWarning::FORMAT_HTML:
       *os << "FORMAT_HTML, \"";
       break;
   }
   // This is just for test error messages, so no need to escape '"'
@@ skipping 135 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions