OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/app/breakpad_mac.h" | 8 #include "chrome/app/breakpad_mac.h" |
9 #include "chrome/browser/accessibility/browser_accessibility_state.h" | 9 #include "chrome/browser/accessibility/browser_accessibility_state.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 render_view_host->AllowBindings(BindingsPolicy::EXTENSION); | 126 render_view_host->AllowBindings(BindingsPolicy::EXTENSION); |
127 } | 127 } |
128 } | 128 } |
129 | 129 |
130 } | 130 } |
131 | 131 |
132 namespace chrome { | 132 namespace chrome { |
133 | 133 |
134 void ChromeContentBrowserClient::RenderViewHostCreated( | 134 void ChromeContentBrowserClient::RenderViewHostCreated( |
135 RenderViewHost* render_view_host) { | 135 RenderViewHost* render_view_host) { |
136 new ChromeRenderViewHostObserver(render_view_host); | 136 |
| 137 SiteInstance* site_instance = render_view_host->site_instance(); |
| 138 Profile* profile = site_instance->browsing_instance()->profile(); |
| 139 |
| 140 new ChromeRenderViewHostObserver(render_view_host, profile->GetPredictor()); |
137 new DevToolsHandler(render_view_host); | 141 new DevToolsHandler(render_view_host); |
138 new ExtensionMessageHandler(render_view_host); | 142 new ExtensionMessageHandler(render_view_host); |
139 | 143 |
140 if (BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) | 144 if (BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) |
141 render_view_host->EnableRendererAccessibility(); | 145 render_view_host->EnableRendererAccessibility(); |
142 | 146 |
143 InitRenderViewHostForExtensions(render_view_host); | 147 InitRenderViewHostForExtensions(render_view_host); |
144 } | 148 } |
145 | 149 |
146 void ChromeContentBrowserClient::BrowserRenderProcessHostCreated( | 150 void ChromeContentBrowserClient::BrowserRenderProcessHostCreated( |
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 #if defined(USE_NSS) | 596 #if defined(USE_NSS) |
593 crypto::CryptoModuleBlockingPasswordDelegate* | 597 crypto::CryptoModuleBlockingPasswordDelegate* |
594 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 598 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
595 const GURL& url) { | 599 const GURL& url) { |
596 return browser::NewCryptoModuleBlockingDialogDelegate( | 600 return browser::NewCryptoModuleBlockingDialogDelegate( |
597 browser::kCryptoModulePasswordKeygen, url.host()); | 601 browser::kCryptoModulePasswordKeygen, url.host()); |
598 } | 602 } |
599 #endif | 603 #endif |
600 | 604 |
601 } // namespace chrome | 605 } // namespace chrome |
OLD | NEW |