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

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

Issue 186023002: DO NOT REVIEW Plumb push messaging registration through to gcm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 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
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/push_messaging/OWNERS » ('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 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "chrome/browser/prerender/prerender_final_status.h" 58 #include "chrome/browser/prerender/prerender_final_status.h"
59 #include "chrome/browser/prerender/prerender_manager.h" 59 #include "chrome/browser/prerender/prerender_manager.h"
60 #include "chrome/browser/prerender/prerender_manager_factory.h" 60 #include "chrome/browser/prerender/prerender_manager_factory.h"
61 #include "chrome/browser/prerender/prerender_message_filter.h" 61 #include "chrome/browser/prerender/prerender_message_filter.h"
62 #include "chrome/browser/prerender/prerender_tracker.h" 62 #include "chrome/browser/prerender/prerender_tracker.h"
63 #include "chrome/browser/printing/printing_message_filter.h" 63 #include "chrome/browser/printing/printing_message_filter.h"
64 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" 64 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
65 #include "chrome/browser/profiles/profile.h" 65 #include "chrome/browser/profiles/profile.h"
66 #include "chrome/browser/profiles/profile_io_data.h" 66 #include "chrome/browser/profiles/profile_io_data.h"
67 #include "chrome/browser/profiles/profile_manager.h" 67 #include "chrome/browser/profiles/profile_manager.h"
68 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
68 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 69 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
69 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" 70 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"
70 #include "chrome/browser/search/instant_service.h" 71 #include "chrome/browser/search/instant_service.h"
71 #include "chrome/browser/search/instant_service_factory.h" 72 #include "chrome/browser/search/instant_service_factory.h"
72 #include "chrome/browser/search/search.h" 73 #include "chrome/browser/search/search.h"
73 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" 74 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h"
74 #include "chrome/browser/signin/principals_message_filter.h" 75 #include "chrome/browser/signin/principals_message_filter.h"
75 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 76 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
76 #include "chrome/browser/speech/tts_message_filter.h" 77 #include "chrome/browser/speech/tts_message_filter.h"
77 #include "chrome/browser/ssl/ssl_add_certificate.h" 78 #include "chrome/browser/ssl/ssl_add_certificate.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 #endif 236 #endif
236 237
237 #if defined(USE_X11) 238 #if defined(USE_X11)
238 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" 239 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h"
239 #endif 240 #endif
240 241
241 #if defined(ENABLE_SPELLCHECK) 242 #if defined(ENABLE_SPELLCHECK)
242 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 243 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
243 #endif 244 #endif
244 245
245
246 #if defined(ENABLE_MDNS) 246 #if defined(ENABLE_MDNS)
247 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h" 247 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h"
248 #endif 248 #endif
249 249
250 using blink::WebWindowFeatures; 250 using blink::WebWindowFeatures;
251 using base::FileDescriptor; 251 using base::FileDescriptor;
252 using content::AccessTokenStore; 252 using content::AccessTokenStore;
253 using content::BrowserChildProcessHostIterator; 253 using content::BrowserChildProcessHostIterator;
254 using content::BrowserThread; 254 using content::BrowserThread;
255 using content::BrowserURLHandler; 255 using content::BrowserURLHandler;
(...skipping 1941 matching lines...) Expand 10 before | Expand all | Expand 10 after
2197 ChromeContentBrowserClient::GetSpeechRecognitionManagerDelegate() { 2197 ChromeContentBrowserClient::GetSpeechRecognitionManagerDelegate() {
2198 #if defined(ENABLE_INPUT_SPEECH) 2198 #if defined(ENABLE_INPUT_SPEECH)
2199 return new speech::ChromeSpeechRecognitionManagerDelegateBubbleUI(); 2199 return new speech::ChromeSpeechRecognitionManagerDelegateBubbleUI();
2200 #else 2200 #else
2201 // Platforms who don't implement x-webkit-speech (a.k.a INPUT_SPEECH) just 2201 // Platforms who don't implement x-webkit-speech (a.k.a INPUT_SPEECH) just
2202 // need the base delegate without the bubble UI. 2202 // need the base delegate without the bubble UI.
2203 return new speech::ChromeSpeechRecognitionManagerDelegate(); 2203 return new speech::ChromeSpeechRecognitionManagerDelegate();
2204 #endif 2204 #endif
2205 } 2205 }
2206 2206
2207 content::PushMessagingService*
2208 ChromeContentBrowserClient::CreatePushMessagingService(
2209 content::BrowserContext* browser_context) {
2210 return new PushMessagingServiceImpl(
2211 Profile::FromBrowserContext(browser_context));
2212 }
2213
2207 net::NetLog* ChromeContentBrowserClient::GetNetLog() { 2214 net::NetLog* ChromeContentBrowserClient::GetNetLog() {
2208 return g_browser_process->net_log(); 2215 return g_browser_process->net_log();
2209 } 2216 }
2210 2217
2211 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { 2218 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() {
2212 return new ChromeAccessTokenStore(); 2219 return new ChromeAccessTokenStore();
2213 } 2220 }
2214 2221
2215 bool ChromeContentBrowserClient::IsFastShutdownPossible() { 2222 bool ChromeContentBrowserClient::IsFastShutdownPossible() {
2216 return true; 2223 return true;
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
2731 switches::kDisableWebRtcEncryption, 2738 switches::kDisableWebRtcEncryption,
2732 }; 2739 };
2733 to_command_line->CopySwitchesFrom(from_command_line, 2740 to_command_line->CopySwitchesFrom(from_command_line,
2734 kWebRtcDevSwitchNames, 2741 kWebRtcDevSwitchNames,
2735 arraysize(kWebRtcDevSwitchNames)); 2742 arraysize(kWebRtcDevSwitchNames));
2736 } 2743 }
2737 } 2744 }
2738 #endif // defined(ENABLE_WEBRTC) 2745 #endif // defined(ENABLE_WEBRTC)
2739 2746
2740 } // namespace chrome 2747 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/push_messaging/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698