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

Side by Side Diff: content/shell/browser/shell_content_browser_client.h

Issue 2946113002: Use FrameIsAd to decide whether to isolate a frame in TopDocumentIsolation mode. (Closed)
Patch Set: Doh... need to also change s/Default/Unspecified/ in chrome_content_browser_client.cc 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility>
10 11
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
13 #include "build/build_config.h" 14 #include "build/build_config.h"
14 #include "content/public/browser/content_browser_client.h" 15 #include "content/public/browser/content_browser_client.h"
15 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" 16 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
16 #include "content/shell/browser/shell_speech_recognition_manager_delegate.h" 17 #include "content/shell/browser/shell_speech_recognition_manager_delegate.h"
17 #include "services/service_manager/public/cpp/binder_registry.h" 18 #include "services/service_manager/public/cpp/binder_registry.h"
18 19
19 namespace content { 20 namespace content {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 118
118 service_manager::BinderRegistryWithParams<content::RenderFrameHost*> 119 service_manager::BinderRegistryWithParams<content::RenderFrameHost*>
119 frame_interfaces_; 120 frame_interfaces_;
120 121
121 ShellBrowserMainParts* shell_browser_main_parts_; 122 ShellBrowserMainParts* shell_browser_main_parts_;
122 }; 123 };
123 124
124 } // namespace content 125 } // namespace content
125 126
126 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 127 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698