Show location for bookmark apps that have navigated across origin.

chrome/browser/extensions/extension_ui_util.cc

 // Copyright 2014 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/extension_ui_util.h"
 
 #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"
 
 namespace extensions {
 
 namespace {
 
 bool IsBlockedByPolicy(const Extension* app, content::BrowserContext* context) {
   Profile* profile = Profile::FromBrowserContext(context);
@@ skipping 32 matching lines @@
   return extension->ShouldDisplayInExtensionSettings() &&
       !util::IsEphemeralApp(extension->id(), context);
 }
 
 bool ShouldNotBeVisible(const Extension* extension,
                         content::BrowserContext* context) {
   return extension->ShouldNotBeVisible() ||
       util::IsEphemeralApp(extension->id(), context);
 }
 
+bool ShouldShowLocationBar(const Extension* extension,
+                           const content::WebContents* web_contents) {
+  // Default to not showing the location bar.
+  if (!extension || !web_contents)
+    return false;

[felt, 2015/03/17 14:52:54]

Is it possible for either |extension| or |web_contents| to ever be null here in
normal browsing operations? If they should always have a value, would DCHECK be
better here?

[benwells, 2015/03/18 08:25:37]

The extension is null when the window is for the devtools. The web_contents
returned by tab_strip_model_->GetActiveWebContents looks like it can be null
(based on the tab_strip_model.h comments and other usage). To be honest I'm not
sure when it can be null.

+
+  GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension);
+  return extension->from_bookmark() &&
+         web_contents->GetVisibleURL().GetOrigin() != launch_url.GetOrigin();

[felt, 2015/03/17 14:52:54]

I think you might want to return true if either GetVisibleURL or
GetLastCommittedURL are different from the original origin.

[benwells, 2015/03/18 08:25:37]

Done.

+}
+
 }  // namespace ui_util
 }  // namespace extensions