Animate showing / hiding the location bar for bookmark apps.

chrome/browser/extensions/extension_ui_util.cc

Index: chrome/browser/extensions/extension_ui_util.cc
diff --git a/chrome/browser/extensions/extension_ui_util.cc b/chrome/browser/extensions/extension_ui_util.cc
index 818b4acd7df3b51f01c2f23e46753fca13b62d2f..4cf4fa89775566d31d8bf15def03738d868f8219 100644
--- a/chrome/browser/extensions/extension_ui_util.cc
+++ b/chrome/browser/extensions/extension_ui_util.cc
@@ -7,9 +7,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/pref_names.h"
-#include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
@@ -27,13 +25,6 @@ bool IsBlockedByPolicy(const Extension* app, content::BrowserContext* context) {
       profile->GetPrefs()->GetBoolean(prefs::kHideWebStoreIcon);
 }
 
-bool IsSameOriginOrMoreSecure(const GURL& app_url, const GURL& page_url) {
-  return (app_url.scheme() == page_url.scheme() ||
-          page_url.scheme() == url::kHttpsScheme) &&
-         app_url.host() == page_url.host() &&
-         app_url.port() == page_url.port();
-}
-
 }  // namespace
 
 namespace ui_util {
@@ -69,26 +60,5 @@ bool ShouldNotBeVisible(const Extension* extension,
       util::IsEphemeralApp(extension->id(), context);
 }
 
-bool ShouldShowLocationBar(const Extension* extension,
-                           const content::WebContents* web_contents) {
-  // Default to not showing the location bar if either |extension| or
-  // |web_contents| are null. |extension| is null for the dev tools.
-  if (!extension || !web_contents)
-    return false;
-
-  if (!extension->from_bookmark())
-    return false;
-
-  // Don't show a location bar until a navigation has occurred.
-  if (web_contents->GetLastCommittedURL().is_empty())
-    return false;
-
-  GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension);
-  return !(IsSameOriginOrMoreSecure(launch_url,
-                                    web_contents->GetVisibleURL()) &&
-           IsSameOriginOrMoreSecure(launch_url,
-                                    web_contents->GetLastCommittedURL()));
-}
-
 }  // namespace ui_util
 }  // namespace extensions