commit 867a73e1e2aad10f60952235da84f5d98cff9aa6
author aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Mar 19 20:45:46 2010
committer aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Mar 19 20:45:46 2010
tree 5e977ff9c87a2cd3de2d7f50b057adbdad4c70bf
parent 35de4be0f924ef6279a6a25fe840522524fa177b

Resubmit 1025006: Refactor app-related manifest properties
so that they don't include the name 'app'.

TBR=erikkay@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42146 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/tab_contents/tab_contents.cc

diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index a869687..384cdd11 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -478,7 +478,7 @@
 }
 
 void TabContents::SetAppExtension(Extension* extension) {
-  DCHECK(!extension || extension->IsApp());
+  DCHECK(!extension || extension->GetFullLaunchURL().is_valid());
   app_extension_ = extension;
 
   NotificationService::current()->Notify(
@@ -1284,7 +1284,7 @@
 
   NavigationEntry* entry = controller().GetActiveEntry();
   if (app_extension_)
-    tab_nav.set_url(app_extension_->app_launch_url());
+    tab_nav.set_url(app_extension_->GetFullLaunchURL());
   else if (entry)
     tab_nav.SetFromNavigationEntry(*entry);