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

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

Issue 11414260: Revert 170451 - [content shell] add support for testRunner.canOpenWindows and disallow opening wind… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/shell/shell_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 21 matching lines...) Expand all
32 virtual void AppendExtraCommandLineSwitches(CommandLine* command_line, 32 virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
33 int child_process_id) OVERRIDE; 33 int child_process_id) OVERRIDE;
34 virtual void OverrideWebkitPrefs(RenderViewHost* render_view_host, 34 virtual void OverrideWebkitPrefs(RenderViewHost* render_view_host,
35 const GURL& url, 35 const GURL& url,
36 webkit_glue::WebPreferences* prefs) OVERRIDE; 36 webkit_glue::WebPreferences* prefs) OVERRIDE;
37 virtual void ResourceDispatcherHostCreated() OVERRIDE; 37 virtual void ResourceDispatcherHostCreated() OVERRIDE;
38 virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE; 38 virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
39 virtual std::string GetDefaultDownloadName() OVERRIDE; 39 virtual std::string GetDefaultDownloadName() OVERRIDE;
40 virtual WebContentsViewDelegate* GetWebContentsViewDelegate( 40 virtual WebContentsViewDelegate* GetWebContentsViewDelegate(
41 WebContents* web_contents) OVERRIDE; 41 WebContents* web_contents) OVERRIDE;
42 virtual bool CanCreateWindow(
43 const GURL& opener_url,
44 const GURL& source_origin,
45 WindowContainerType container_type,
46 ResourceContext* context,
47 int render_process_id,
48 bool* no_javascript_access) OVERRIDE;
49 42
50 #if defined(OS_ANDROID) 43 #if defined(OS_ANDROID)
51 virtual void GetAdditionalMappedFilesForChildProcess( 44 virtual void GetAdditionalMappedFilesForChildProcess(
52 const CommandLine& command_line, 45 const CommandLine& command_line,
53 int child_process_id, 46 int child_process_id,
54 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 47 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
55 #endif 48 #endif
56 49
57 ShellBrowserContext* browser_context(); 50 ShellBrowserContext* browser_context();
58 ShellBrowserContext* off_the_record_browser_context(); 51 ShellBrowserContext* off_the_record_browser_context();
59 ShellResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() { 52 ShellResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() {
60 return resource_dispatcher_host_delegate_.get(); 53 return resource_dispatcher_host_delegate_.get();
61 } 54 }
62 ShellBrowserMainParts* shell_browser_main_parts() { 55 ShellBrowserMainParts* shell_browser_main_parts() {
63 return shell_browser_main_parts_; 56 return shell_browser_main_parts_;
64 } 57 }
65 58
66 private: 59 private:
67 scoped_ptr<ShellResourceDispatcherHostDelegate> 60 scoped_ptr<ShellResourceDispatcherHostDelegate>
68 resource_dispatcher_host_delegate_; 61 resource_dispatcher_host_delegate_;
69 62
70 FilePath webkit_source_dir_; 63 FilePath webkit_source_dir_;
71 64
72 ShellBrowserMainParts* shell_browser_main_parts_; 65 ShellBrowserMainParts* shell_browser_main_parts_;
73 }; 66 };
74 67
75 } // namespace content 68 } // namespace content
76 69
77 #endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ 70 #endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | content/shell/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698