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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2555833002: Remove enable_notifications build flag and define (Closed)
Patch Set: Merge Created 4 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
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 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2251 matching lines...) Expand 10 before | Expand all | Expand 10 after
2262 chrome::ShowSSLClientCertificateSelector(web_contents, cert_request_info, 2262 chrome::ShowSSLClientCertificateSelector(web_contents, cert_request_info,
2263 std::move(delegate)); 2263 std::move(delegate));
2264 } 2264 }
2265 2265
2266 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { 2266 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() {
2267 return MediaCaptureDevicesDispatcher::GetInstance(); 2267 return MediaCaptureDevicesDispatcher::GetInstance();
2268 } 2268 }
2269 2269
2270 content::PlatformNotificationService* 2270 content::PlatformNotificationService*
2271 ChromeContentBrowserClient::GetPlatformNotificationService() { 2271 ChromeContentBrowserClient::GetPlatformNotificationService() {
2272 #if defined(ENABLE_NOTIFICATIONS)
2273 return PlatformNotificationServiceImpl::GetInstance(); 2272 return PlatformNotificationServiceImpl::GetInstance();
2274 #else
2275 NOTIMPLEMENTED();
2276 return NULL;
2277 #endif
2278 } 2273 }
2279 2274
2280 bool ChromeContentBrowserClient::CanCreateWindow( 2275 bool ChromeContentBrowserClient::CanCreateWindow(
2281 const GURL& opener_url, 2276 const GURL& opener_url,
2282 const GURL& opener_top_level_frame_url, 2277 const GURL& opener_top_level_frame_url,
2283 const GURL& source_origin, 2278 const GURL& source_origin,
2284 WindowContainerType container_type, 2279 WindowContainerType container_type,
2285 const GURL& target_url, 2280 const GURL& target_url,
2286 const content::Referrer& referrer, 2281 const content::Referrer& referrer,
2287 const std::string& frame_name, 2282 const std::string& frame_name,
(...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
3315 render_frame_host, std::move(source), std::move(request)); 3310 render_frame_host, std::move(source), std::move(request));
3316 #else 3311 #else
3317 // Chrome's media remoting implementation depends on the Media Router 3312 // Chrome's media remoting implementation depends on the Media Router
3318 // infrastructure to identify remote sinks and provide the user interface for 3313 // infrastructure to identify remote sinks and provide the user interface for
3319 // sink selection. In the case where the Media Router is not present, simply 3314 // sink selection. In the case where the Media Router is not present, simply
3320 // drop the interface request. This will prevent code paths for media remoting 3315 // drop the interface request. This will prevent code paths for media remoting
3321 // in the renderer process from activating. 3316 // in the renderer process from activating.
3322 #endif 3317 #endif
3323 } 3318 }
3324 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) 3319 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/extensions/extension_system_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698