Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: chrome/browser/ui/extensions/bookmark_app_browser_controller.cc

Issue 1164873003: Show origin for hosted apps that navigate away from their start origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback for the stig Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
(Empty)
1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "chrome/browser/ui/extensions/bookmark_app_browser_controller.h"
6
7 #include "base/command_line.h"
8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ssl/connection_security_helper.h"
10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/browser/ui/host_desktop.h"
13 #include "chrome/browser/ui/location_bar/location_bar.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/browser/web_applications/web_app.h"
16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
18 #include "content/public/browser/web_contents.h"
19 #include "extensions/browser/extension_registry.h"
20 #include "extensions/common/extension.h"
21 #include "url/gurl.h"
22
23 namespace extensions {
24
25 namespace {
26
27 bool IsSameOriginOrMoreSecure(const GURL& app_url, const GURL& page_url) {
28 return (app_url.scheme() == page_url.scheme() ||
29 page_url.scheme() == url::kHttpsScheme) &&
30 app_url.host() == page_url.host() &&
31 app_url.port() == page_url.port();
32 }
33
34 bool IsWebAppFrameEnabled() {
35 return base::CommandLine::ForCurrentProcess()->HasSwitch(
36 switches::kEnableWebAppFrame);
37 }
38
39 } // namespace
40
41 // static
42 bool BookmarkAppBrowserController::IsForBookmarkApp(Browser* browser) {
43 const std::string extension_id =
44 web_app::GetExtensionIdFromApplicationName(browser->app_name());
45 const Extension* extension =
46 ExtensionRegistry::Get(browser->profile())->GetExtensionById(
47 extension_id, ExtensionRegistry::EVERYTHING);
48 return extension && extension->from_bookmark();
49 }
50
51 BookmarkAppBrowserController::BookmarkAppBrowserController(Browser* browser)
52 : browser_(browser),
53 extension_id_(
54 web_app::GetExtensionIdFromApplicationName(browser->app_name())),
55 should_use_web_app_frame_(browser->host_desktop_type() ==
56 chrome::HOST_DESKTOP_TYPE_ASH &&
57 IsWebAppFrameEnabled()) {
58 }
59
60 BookmarkAppBrowserController::~BookmarkAppBrowserController() {
61 }
62
63 bool BookmarkAppBrowserController::SupportsLocationBar() {
64 return !should_use_web_app_frame();
65 }
66
67 bool BookmarkAppBrowserController::ShouldShowLocationBar() {
68 const Extension* extension =
69 ExtensionRegistry::Get(browser_->profile())->GetExtensionById(
70 extension_id_, ExtensionRegistry::EVERYTHING);
71
72 const content::WebContents* web_contents =
73 browser_->tab_strip_model()->GetActiveWebContents();
74
75 // Default to not showing the location bar if either |extension| or
76 // |web_contents| are null. |extension| is null for the dev tools.
77 if (!extension || !web_contents)
78 return false;
79
80 if (!extension->from_bookmark())
81 return false;
82
83 // Don't show a location bar until a navigation has occurred.
84 if (web_contents->GetLastCommittedURL().is_empty())
85 return false;
86
87 ConnectionSecurityHelper::SecurityLevel security_level =
88 ConnectionSecurityHelper::GetSecurityLevelForWebContents(web_contents);
89 if (security_level == ConnectionSecurityHelper::SECURITY_ERROR)
90 return true;
91
92 GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension);
93 return !(IsSameOriginOrMoreSecure(launch_url,
94 web_contents->GetVisibleURL()) &&
95 IsSameOriginOrMoreSecure(launch_url,
96 web_contents->GetLastCommittedURL()));
97 }
98
99 void BookmarkAppBrowserController::UpdateLocationBarVisibility(bool animate) {
100 if (!SupportsLocationBar())
101 return;
102
103 browser_->window()->GetLocationBar()->UpdateLocationBarVisibility(
104 ShouldShowLocationBar(), animate);
105 }
106
107 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698