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

Side by Side Diff: chrome/browser/extensions/chrome_content_browser_client_extensions_part.h

Issue 2987563004: Revert of Use FrameIsAd to decide whether to isolate a frame in TopDocumentIsolation mode. (Closed)
Patch Set: Created 3 years, 5 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
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_CONTENT_BROWSER_CLIENT_EXTENSIONS_PART_ H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_CHROME_CONTENT_BROWSER_CLIENT_EXTENSIONS_PART_ H_
6 #define CHROME_BROWSER_EXTENSIONS_CHROME_CONTENT_BROWSER_CLIENT_EXTENSIONS_PART_ H_ 6 #define CHROME_BROWSER_EXTENSIONS_CHROME_CONTENT_BROWSER_CLIENT_EXTENSIONS_PART_ H_
7 7
8 #include <memory>
9 #include <string>
10 #include <vector>
11
12 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
13 #include "base/macros.h" 9 #include "base/macros.h"
14 #include "chrome/browser/chrome_content_browser_client_parts.h" 10 #include "chrome/browser/chrome_content_browser_client_parts.h"
15 #include "ui/base/page_transition_types.h" 11 #include "ui/base/page_transition_types.h"
16 12
17 namespace content { 13 namespace content {
18 struct Referrer; 14 struct Referrer;
19 class ResourceContext; 15 class ResourceContext;
20 class VpnServiceProxy; 16 class VpnServiceProxy;
21 } 17 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 bool* result); 64 bool* result);
69 65
70 // Helper function to call InfoMap::SetSigninProcess(). 66 // Helper function to call InfoMap::SetSigninProcess().
71 static void SetSigninProcess(content::SiteInstance* site_instance); 67 static void SetSigninProcess(content::SiteInstance* site_instance);
72 68
73 // Creates a new VpnServiceProxy. The caller owns the returned value. It's 69 // Creates a new VpnServiceProxy. The caller owns the returned value. It's
74 // valid to return nullptr. 70 // valid to return nullptr.
75 static std::unique_ptr<content::VpnServiceProxy> GetVpnServiceProxy( 71 static std::unique_ptr<content::VpnServiceProxy> GetVpnServiceProxy(
76 content::BrowserContext* browser_context); 72 content::BrowserContext* browser_context);
77 73
78 static bool IsMainFrameSiteInstanceExcludedFromTopDocumentIsolation( 74 static bool ShouldFrameShareParentSiteInstanceDespiteTopDocumentIsolation(
79 content::SiteInstance* main_frame_site_instance); 75 const GURL& url,
76 content::SiteInstance* parent_site_instance);
80 77
81 private: 78 private:
82 FRIEND_TEST_ALL_PREFIXES(ChromeContentBrowserClientExtensionsPartTest, 79 FRIEND_TEST_ALL_PREFIXES(ChromeContentBrowserClientExtensionsPartTest,
83 ShouldAllowOpenURLMetricsForEmptySiteURL); 80 ShouldAllowOpenURLMetricsForEmptySiteURL);
84 FRIEND_TEST_ALL_PREFIXES(ChromeContentBrowserClientExtensionsPartTest, 81 FRIEND_TEST_ALL_PREFIXES(ChromeContentBrowserClientExtensionsPartTest,
85 ShouldAllowOpenURLMetricsForKnownSchemes); 82 ShouldAllowOpenURLMetricsForKnownSchemes);
86 83
87 // Specifies reasons why web-accessible resource checks in ShouldAllowOpenURL 84 // Specifies reasons why web-accessible resource checks in ShouldAllowOpenURL
88 // might fail. 85 // might fail.
89 // 86 //
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 Profile* profile) override; 123 Profile* profile) override;
127 void ResourceDispatcherHostCreated() override; 124 void ResourceDispatcherHostCreated() override;
128 125
129 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClientExtensionsPart); 126 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClientExtensionsPart);
130 }; 127 };
131 128
132 } // namespace extensions 129 } // namespace extensions
133 130
134 #endif // CHROME_BROWSER_EXTENSIONS_CHROME_CONTENT_BROWSER_CLIENT_EXTENSIONS_PA RT_H_ 131 #endif // CHROME_BROWSER_EXTENSIONS_CHROME_CONTENT_BROWSER_CLIENT_EXTENSIONS_PA RT_H_
135 132
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698