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

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

Issue 2478573004: Convert GURL::{host,path} to GURL::{host_piece,path_piece} for ==. (Closed)
Patch Set: rebase to #431874 Created 4 years, 1 month 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
1 // Copyright 2015 The Chromium Authors. All rights reserved. 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 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h" 5 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ssl/chrome_security_state_model_client.h" 9 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/browser/ui/location_bar/location_bar.h" 12 #include "chrome/browser/ui/location_bar/location_bar.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/browser/web_applications/web_app.h" 14 #include "chrome/browser/web_applications/web_app.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 16 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
17 #include "components/security_state/security_state_model.h" 17 #include "components/security_state/security_state_model.h"
18 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
19 #include "extensions/browser/extension_registry.h" 19 #include "extensions/browser/extension_registry.h"
20 #include "extensions/common/extension.h" 20 #include "extensions/common/extension.h"
21 #include "url/gurl.h" 21 #include "url/gurl.h"
22 22
23 namespace extensions { 23 namespace extensions {
24 24
25 namespace { 25 namespace {
26 26
27 bool IsSameOriginOrMoreSecure(const GURL& app_url, const GURL& page_url) { 27 bool IsSameOriginOrMoreSecure(const GURL& app_url, const GURL& page_url) {
28 const std::string www("www."); 28 const std::string www("www.");
29 return (app_url.scheme() == page_url.scheme() || 29 return (app_url.scheme_piece() == page_url.scheme_piece() ||
30 page_url.scheme() == url::kHttpsScheme) && 30 page_url.scheme_piece() == url::kHttpsScheme) &&
31 (app_url.host() == page_url.host() || 31 (app_url.host_piece() == page_url.host_piece() ||
32 www + app_url.host() == page_url.host()) && 32 www + app_url.host() == page_url.host_piece()) &&
33 app_url.port() == page_url.port(); 33 app_url.port() == page_url.port();
34 } 34 }
35 35
36 #if defined(USE_ASH) 36 #if defined(USE_ASH)
37 bool IsWebAppFrameEnabled() { 37 bool IsWebAppFrameEnabled() {
38 return base::CommandLine::ForCurrentProcess()->HasSwitch( 38 return base::CommandLine::ForCurrentProcess()->HasSwitch(
39 switches::kEnableWebAppFrame); 39 switches::kEnableWebAppFrame);
40 } 40 }
41 #endif // USE_ASH 41 #endif // USE_ASH
42 42
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 void HostedAppBrowserController::UpdateLocationBarVisibility( 114 void HostedAppBrowserController::UpdateLocationBarVisibility(
115 bool animate) const { 115 bool animate) const {
116 if (!SupportsLocationBar()) 116 if (!SupportsLocationBar())
117 return; 117 return;
118 118
119 browser_->window()->GetLocationBar()->UpdateLocationBarVisibility( 119 browser_->window()->GetLocationBar()->UpdateLocationBarVisibility(
120 ShouldShowLocationBar(), animate); 120 ShouldShowLocationBar(), animate);
121 } 121 }
122 122
123 } // namespace extensions 123 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/startup/startup_tab_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698