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

Unified Diff: content/shell/browser/shell_content_browser_client.cc

Issue 639293005: Content Shell: Introduce LayoutTestContentBrowserClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/browser/shell_content_browser_client.h ('k') | content/shell/browser/shell_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 01bc93bdadfebd3155538932217fdf741cfee0c2..af3c7e558734d15b833e6328c9df858969133729 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -25,7 +25,6 @@
#include "content/shell/browser/shell_devtools_delegate.h"
#include "content/shell/browser/shell_message_filter.h"
#include "content/shell/browser/shell_net_log.h"
-#include "content/shell/browser/shell_notification_manager.h"
#include "content/shell/browser/shell_quota_permission_context.h"
#include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
#include "content/shell/browser/shell_web_contents_view_delegate_creator.h"
@@ -117,18 +116,6 @@ int GetCrashSignalFD(const CommandLine& command_line) {
}
#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-void RequestDesktopNotificationPermissionOnIO(
- const GURL& source_origin,
- RenderFrameHost* render_frame_host,
- const base::Callback<void(blink::WebNotificationPermission)>& callback) {
- ShellNotificationManager* manager =
- ShellContentBrowserClient::Get()->GetShellNotificationManager();
- if (manager)
- manager->RequestPermission(source_origin, callback);
- else
- callback.Run(blink::WebNotificationPermissionAllowed);
-}
-
} // namespace
ShellContentBrowserClient* ShellContentBrowserClient::Get() {
@@ -152,18 +139,6 @@ ShellContentBrowserClient::~ShellContentBrowserClient() {
g_browser_client = NULL;
}
-ShellNotificationManager*
-ShellContentBrowserClient::GetShellNotificationManager() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
- return NULL;
-
- if (!shell_notification_manager_)
- shell_notification_manager_.reset(new ShellNotificationManager());
-
- return shell_notification_manager_.get();
-}
-
BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
const MainFunctionParams& parameters) {
shell_browser_main_parts_ =
@@ -314,31 +289,6 @@ ShellContentBrowserClient::CreateQuotaPermissionContext() {
return new ShellQuotaPermissionContext();
}
-void ShellContentBrowserClient::RequestDesktopNotificationPermission(
- const GURL& source_origin,
- RenderFrameHost* render_frame_host,
- const base::Callback<void(blink::WebNotificationPermission)>& callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- BrowserThread::PostTask(BrowserThread::IO,
- FROM_HERE,
- base::Bind(&RequestDesktopNotificationPermissionOnIO,
- source_origin,
- render_frame_host,
- callback));
-}
-
-blink::WebNotificationPermission
-ShellContentBrowserClient::CheckDesktopNotificationPermission(
- const GURL& source_url,
- ResourceContext* context,
- int render_process_id) {
- ShellNotificationManager* manager = GetShellNotificationManager();
- if (manager)
- return manager->CheckPermission(source_url);
-
- return blink::WebNotificationPermissionAllowed;
-}
-
SpeechRecognitionManagerDelegate*
ShellContentBrowserClient::GetSpeechRecognitionManagerDelegate() {
return new ShellSpeechRecognitionManagerDelegate();
« no previous file with comments | « content/shell/browser/shell_content_browser_client.h ('k') | content/shell/browser/shell_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698