Use manifest for streamlined hosted app creation for title and URL.

chrome/browser/extensions/tab_helper.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/extensions/tab_helper.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 101 matching lines @@
                  content::Source<NavigationController>(
                      &web_contents->GetController()));
 }
 
 TabHelper::~TabHelper() {
   RemoveScriptExecutionObserver(ActivityLog::GetInstance(profile_));
 }
 
 void TabHelper::CreateApplicationShortcuts() {
   DCHECK(CanCreateApplicationShortcuts());
+  if (pending_web_app_action_ != NONE)
+    return;
+
   // Start fetching web app info for CreateApplicationShortcut dialog and show
   // the dialog when the data is available in OnDidGetApplicationInfo.
   GetApplicationInfo(CREATE_SHORTCUT);
 }
 
 void TabHelper::CreateHostedAppFromWebContents() {
   DCHECK(CanCreateBookmarkApp());
+  if (pending_web_app_action_ != NONE)
+    return;
+
   // Start fetching web app info for CreateApplicationShortcut dialog and show
   // the dialog when the data is available in OnDidGetApplicationInfo.
   GetApplicationInfo(CREATE_HOSTED_APP);
 }
 
 bool TabHelper::CanCreateApplicationShortcuts() const {
 #if defined(OS_MACOSX)
   return false;
 #else
-  return web_app::IsValidUrl(web_contents()->GetURL()) &&
-      pending_web_app_action_ == NONE;
+  return web_app::IsValidUrl(web_contents()->GetURL());
 #endif
 }
 
 bool TabHelper::CanCreateBookmarkApp() const {
 #if defined(OS_MACOSX)
   return false;
 #else
-  return IsValidBookmarkAppUrl(web_contents()->GetURL()) &&
-         pending_web_app_action_ == NONE;
+  return IsValidBookmarkAppUrl(web_contents()->GetURL());
 #endif
 }
 
 void TabHelper::AddScriptExecutionObserver(ScriptExecutionObserver* observer) {
   script_execution_observers_.AddObserver(observer);
 }
 
 void TabHelper::RemoveScriptExecutionObserver(
     ScriptExecutionObserver* observer) {
   script_execution_observers_.RemoveObserver(observer);
@@ skipping 376 matching lines @@
   }
 }
 
 void TabHelper::SetTabId(RenderViewHost* render_view_host) {
   render_view_host->Send(
       new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(),
                                 SessionTabHelper::IdForTab(web_contents())));
 }
 
 }  // namespace extensions