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

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

Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android geolocation breakage Created 5 years, 9 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 <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 47 void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
48 int child_process_id) override; 48 int child_process_id) override;
49 void OverrideWebkitPrefs(RenderViewHost* render_view_host, 49 void OverrideWebkitPrefs(RenderViewHost* render_view_host,
50 WebPreferences* prefs) override; 50 WebPreferences* prefs) override;
51 void ResourceDispatcherHostCreated() override; 51 void ResourceDispatcherHostCreated() override;
52 AccessTokenStore* CreateAccessTokenStore() override; 52 AccessTokenStore* CreateAccessTokenStore() override;
53 std::string GetDefaultDownloadName() override; 53 std::string GetDefaultDownloadName() override;
54 WebContentsViewDelegate* GetWebContentsViewDelegate( 54 WebContentsViewDelegate* GetWebContentsViewDelegate(
55 WebContents* web_contents) override; 55 WebContents* web_contents) override;
56 QuotaPermissionContext* CreateQuotaPermissionContext() override; 56 QuotaPermissionContext* CreateQuotaPermissionContext() override;
57 void RequestPermission(
58 PermissionType permission,
59 WebContents* web_contents,
60 int bridge_id,
61 const GURL& requesting_frame,
62 bool user_gesture,
63 const base::Callback<void(PermissionStatus)>& callback) override;
64
57 SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate() 65 SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate()
58 override; 66 override;
59 net::NetLog* GetNetLog() override; 67 net::NetLog* GetNetLog() override;
60 bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context, 68 bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context,
61 const GURL& current_url, 69 const GURL& current_url,
62 const GURL& new_url) override; 70 const GURL& new_url) override;
63 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; 71 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
64 72
65 void OpenURL(BrowserContext* browser_context, 73 void OpenURL(BrowserContext* browser_context,
66 const OpenURLParams& params, 74 const OpenURLParams& params,
(...skipping 30 matching lines...) Expand all
97 base::ScopedFD v8_natives_fd_; 105 base::ScopedFD v8_natives_fd_;
98 base::ScopedFD v8_snapshot_fd_; 106 base::ScopedFD v8_snapshot_fd_;
99 #endif 107 #endif
100 108
101 ShellBrowserMainParts* shell_browser_main_parts_; 109 ShellBrowserMainParts* shell_browser_main_parts_;
102 }; 110 };
103 111
104 } // namespace content 112 } // namespace content
105 113
106 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 114 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698