Remove unused members from WebApplicationInfo.

chrome/common/extensions/manifest_handlers/app_launch_info.cc

 // Copyright 2013 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/manifest_handlers/app_launch_info.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 159 matching lines @@
     return false;
   }
 
   // For the Chrome component app, override launch url to new tab.
   if (extension->id() == extension_misc::kChromeAppId) {
     launch_web_url_ = GURL(chrome::kChromeUINewTabURL);
     return true;
   }
 
   // If there is no extent, we default the extent based on the launch URL.
-  if (extension->web_extent().is_empty() && !launch_web_url_.is_empty()) {
+  // Bookmark apps are permissionless and shouldn't be restricted by overlapping
+  // extents.

[benwells, 2014/01/21 22:42:13]

Isn't this from another change, and no longer needed?

[calamity, 2014/01/24 06:06:13]

My bad, branch management. Removed.

+  if (extension->web_extent().is_empty() && !launch_web_url_.is_empty() &&
+      !extension->from_bookmark()) {
     URLPattern pattern(Extension::kValidWebExtentSchemes);
     if (!pattern.SetScheme("*")) {
       *error = ErrorUtils::FormatErrorMessageUTF16(
           errors::kInvalidLaunchValue,
           keys::kLaunchWebURL);
       return false;
     }
     pattern.SetHost(launch_web_url_.host());
     pattern.SetPath("/*");
     extension->AddWebExtentPattern(pattern);
@@ skipping 126 matching lines @@
     keys::kLaunchLocalPath,
     keys::kLaunchWebURL,
     keys::kLaunchContainer,
     keys::kLaunchHeight,
     keys::kLaunchWidth
   };
   return std::vector<std::string>(keys, keys + arraysize(keys));
 }
 
 }  // namespace extensions