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

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

Issue 10386223: Renaming poorly named classes and adding missing unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Undo rename of Dispatcher Created 8 years, 7 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 30 matching lines...) Expand all
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_message_filter.h"
51 #include "chrome/browser/prerender/prerender_tracker.h" 51 #include "chrome/browser/prerender/prerender_render_view_tracker.h"
52 #include "chrome/browser/printing/printing_message_filter.h" 52 #include "chrome/browser/printing/printing_message_filter.h"
53 #include "chrome/browser/profiles/profile.h" 53 #include "chrome/browser/profiles/profile.h"
54 #include "chrome/browser/profiles/profile_io_data.h" 54 #include "chrome/browser/profiles/profile_io_data.h"
55 #include "chrome/browser/profiles/profile_manager.h" 55 #include "chrome/browser/profiles/profile_manager.h"
56 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 56 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
57 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h" 57 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h"
58 #include "chrome/browser/renderer_host/plugin_info_message_filter.h" 58 #include "chrome/browser/renderer_host/plugin_info_message_filter.h"
59 #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"
60 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 60 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
61 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 61 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 WebContents* tab = tab_util::GetWebContentsByID( 1027 WebContents* tab = tab_util::GetWebContentsByID(
1028 render_process_id, render_view_id); 1028 render_process_id, render_view_id);
1029 if (!tab) { 1029 if (!tab) {
1030 NOTREACHED(); 1030 NOTREACHED();
1031 return; 1031 return;
1032 } 1032 }
1033 prerender::PrerenderManager* prerender_manager = 1033 prerender::PrerenderManager* prerender_manager =
1034 prerender::PrerenderManagerFactory::GetForProfile( 1034 prerender::PrerenderManagerFactory::GetForProfile(
1035 Profile::FromBrowserContext(tab->GetBrowserContext())); 1035 Profile::FromBrowserContext(tab->GetBrowserContext()));
1036 if (prerender_manager && prerender_manager->IsWebContentsPrerendering(tab)) { 1036 if (prerender_manager && prerender_manager->IsWebContentsPrerendering(tab)) {
1037 if (prerender_manager->prerender_tracker()->TryCancel( 1037 if (prerender_manager->prerender_render_view_tracker()->TryCancel(
1038 render_process_id, render_view_id, 1038 render_process_id, render_view_id,
1039 prerender::FINAL_STATUS_SSL_ERROR)) { 1039 prerender::FINAL_STATUS_SSL_ERROR)) {
1040 *cancel_request = true; 1040 *cancel_request = true;
1041 return; 1041 return;
1042 } 1042 }
1043 } 1043 }
1044 1044
1045 // Otherwise, display an SSL blocking page. 1045 // Otherwise, display an SSL blocking page.
1046 new SSLBlockingPage(tab, cert_error, ssl_info, request_url, overridable, 1046 new SSLBlockingPage(tab, cert_error, ssl_info, request_url, overridable,
1047 strict_enforcement, callback); 1047 strict_enforcement, callback);
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
1617 #if defined(USE_NSS) 1617 #if defined(USE_NSS)
1618 crypto::CryptoModuleBlockingPasswordDelegate* 1618 crypto::CryptoModuleBlockingPasswordDelegate*
1619 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1619 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1620 const GURL& url) { 1620 const GURL& url) {
1621 return browser::NewCryptoModuleBlockingDialogDelegate( 1621 return browser::NewCryptoModuleBlockingDialogDelegate(
1622 browser::kCryptoModulePasswordKeygen, url.host()); 1622 browser::kCryptoModulePasswordKeygen, url.host());
1623 } 1623 }
1624 #endif 1624 #endif
1625 1625
1626 } // namespace chrome 1626 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698