Move the parsing of app.launch related keys out of Extension class.

chrome/browser/ui/webui/options/content_settings_handler.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/browser/ui/webui/options/content_settings_handler.h"
 
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
+#include "chrome/common/extensions/app_launcher_info.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_switches.h"
@@ skipping 180 matching lines @@
     if (!app_filter(**extension, profile)) continue;
 
     extensions::URLPatternSet web_extent = (*extension)->web_extent();
     // Add patterns from web extent.
     for (extensions::URLPatternSet::const_iterator pattern = web_extent.begin();
          pattern != web_extent.end(); ++pattern) {
       std::string url_pattern = pattern->GetAsString();
       AddExceptionForHostedApp(url_pattern, **extension, exceptions);
     }
     // Retrieve the launch URL.
-    std::string launch_url_string = (*extension)->launch_web_url();
+    std::string launch_url_string =
+        extensions::AppLauncherInfo::GetLaunchWebURL(*extension);
     GURL launch_url(launch_url_string);
     // Skip adding the launch URL if it is part of the web extent.
     if (web_extent.MatchesURL(launch_url)) continue;
     AddExceptionForHostedApp(launch_url_string, **extension, exceptions);
   }
 }
 
 }  // namespace
 
 namespace options {
@@ skipping 1142 matching lines @@
             media_settings_.flash_default_setting,
             media_settings_.flash_exceptions,
             media_settings_.policy_disable_audio,
             media_settings_.policy_disable_video)) {
       ShowFlashMediaLink(EXCEPTIONS, true);
     }
   }
 }
 
 }  // namespace options