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

chrome/browser/ui/tabs/pinned_tab_codec.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/tabs/pinned_tab_codec.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/extensions/app_launcher_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
 using content::NavigationEntry;
 
 // Key used in dictionaries for the app id.
 static const char kAppID[] = "app_id";
@@ skipping 29 matching lines @@
 
   content::WebContents* web_contents = model->GetWebContentsAt(index);
   if (model->IsAppTab(index)) {
     const extensions::Extension* extension =
         extensions::TabHelper::FromWebContents(web_contents)->extension_app();
     DCHECK(extension);
     value->SetString(kAppID, extension->id());
     // For apps we use the launch url. We do this because the user is
     // effectively restarting the app, so returning them to the app's launch
     // page seems closest to what they expect.
-    value->SetString(kURL, extension->GetFullLaunchURL().spec());
+    value->SetString(
+        kURL, extensions::AppLauncherInfo::GetFullLaunchURL(extension).spec());
     values->Append(value.release());
   } else {
     NavigationEntry* entry = web_contents->GetController().GetActiveEntry();
     if (!entry && web_contents->GetController().GetEntryCount())
       entry = web_contents->GetController().GetEntryAtIndex(0);
     if (entry) {
       value->SetString(kURL, entry->GetURL().spec());
       values->Append(value.release());
     }
   }
@@ skipping 78 matching lines @@
   for (size_t i = 0, max = tabs_list->GetSize(); i < max; ++i) {
     const base::DictionaryValue* tab_values = NULL;
     if (tabs_list->GetDictionary(i, &tab_values)) {
       StartupTab tab;
       if (DecodeTab(*tab_values, &tab))
         results.push_back(tab);
     }
   }
   return results;
 }