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

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

Issue 9875026: **NOTFORLANDING** New link rel=prerender API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch sets 3-7 against trunk, for combined browsing Created 8 years, 8 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 | Annotate | Revision Log
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 29 matching lines...) Expand all
40 #include "chrome/browser/media/media_internals.h" 40 #include "chrome/browser/media/media_internals.h"
41 #include "chrome/browser/net/chrome_net_log.h" 41 #include "chrome/browser/net/chrome_net_log.h"
42 #include "chrome/browser/notifications/desktop_notification_service.h" 42 #include "chrome/browser/notifications/desktop_notification_service.h"
43 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 43 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
44 #include "chrome/browser/pepper_gtalk_message_filter.h" 44 #include "chrome/browser/pepper_gtalk_message_filter.h"
45 #include "chrome/browser/platform_util.h" 45 #include "chrome/browser/platform_util.h"
46 #include "chrome/browser/prefs/pref_service.h" 46 #include "chrome/browser/prefs/pref_service.h"
47 #include "chrome/browser/prefs/scoped_user_pref_update.h" 47 #include "chrome/browser/prefs/scoped_user_pref_update.h"
48 #include "chrome/browser/prerender/prerender_manager.h" 48 #include "chrome/browser/prerender/prerender_manager.h"
49 #include "chrome/browser/prerender/prerender_manager_factory.h" 49 #include "chrome/browser/prerender/prerender_manager_factory.h"
50 #include "chrome/browser/prerender/prerender_message_filter.h"
50 #include "chrome/browser/prerender/prerender_tracker.h" 51 #include "chrome/browser/prerender/prerender_tracker.h"
51 #include "chrome/browser/printing/printing_message_filter.h" 52 #include "chrome/browser/printing/printing_message_filter.h"
52 #include "chrome/browser/profiles/profile.h" 53 #include "chrome/browser/profiles/profile.h"
53 #include "chrome/browser/profiles/profile_io_data.h" 54 #include "chrome/browser/profiles/profile_io_data.h"
54 #include "chrome/browser/profiles/profile_manager.h" 55 #include "chrome/browser/profiles/profile_manager.h"
55 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 56 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
56 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" 57 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h"
57 #include "chrome/browser/renderer_host/plugin_info_message_filter.h" 58 #include "chrome/browser/renderer_host/plugin_info_message_filter.h"
58 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h" 59 #include "chrome/browser/search_engines/search_provider_install_state_message_fi lter.h"
59 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 60 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 host->GetChannel()->AddFilter(new PrintingMessageFilter()); 405 host->GetChannel()->AddFilter(new PrintingMessageFilter());
405 #endif 406 #endif
406 host->GetChannel()->AddFilter( 407 host->GetChannel()->AddFilter(
407 new SearchProviderInstallStateMessageFilter(id, profile)); 408 new SearchProviderInstallStateMessageFilter(id, profile));
408 host->GetChannel()->AddFilter(new SpellCheckMessageFilter(id)); 409 host->GetChannel()->AddFilter(new SpellCheckMessageFilter(id));
409 #if defined(OS_MACOSX) 410 #if defined(OS_MACOSX)
410 host->GetChannel()->AddFilter(new SpellCheckMessageFilterMac()); 411 host->GetChannel()->AddFilter(new SpellCheckMessageFilterMac());
411 #endif 412 #endif
412 host->GetChannel()->AddFilter(new ChromeBenchmarkingMessageFilter( 413 host->GetChannel()->AddFilter(new ChromeBenchmarkingMessageFilter(
413 id, profile, profile->GetRequestContextForRenderProcess(id))); 414 id, profile, profile->GetRequestContextForRenderProcess(id)));
415 host->GetChannel()->AddFilter(
416 new prerender::PrerenderMessageFilter(id, profile));
414 417
415 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 418 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
416 profile->IsOffTheRecord())); 419 profile->IsOffTheRecord()));
417 420
418 SendExtensionWebRequestStatusToHost(host); 421 SendExtensionWebRequestStatusToHost(host);
419 422
420 RendererContentSettingRules rules; 423 RendererContentSettingRules rules;
421 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); 424 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
422 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); 425 host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
423 } 426 }
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 #if defined(USE_NSS) 1631 #if defined(USE_NSS)
1629 crypto::CryptoModuleBlockingPasswordDelegate* 1632 crypto::CryptoModuleBlockingPasswordDelegate*
1630 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1633 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1631 const GURL& url) { 1634 const GURL& url) {
1632 return browser::NewCryptoModuleBlockingDialogDelegate( 1635 return browser::NewCryptoModuleBlockingDialogDelegate(
1633 browser::kCryptoModulePasswordKeygen, url.host()); 1636 browser::kCryptoModulePasswordKeygen, url.host());
1634 } 1637 }
1635 #endif 1638 #endif
1636 1639
1637 } // namespace chrome 1640 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698