OLD | NEW |
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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 #include "chrome/browser/ssl/ssl_tab_helper.h" | 76 #include "chrome/browser/ssl/ssl_tab_helper.h" |
77 #include "chrome/browser/tab_contents/tab_util.h" | 77 #include "chrome/browser/tab_contents/tab_util.h" |
78 #include "chrome/browser/toolkit_extra_parts.h" | 78 #include "chrome/browser/toolkit_extra_parts.h" |
79 #include "chrome/browser/ui/chrome_select_file_policy.h" | 79 #include "chrome/browser/ui/chrome_select_file_policy.h" |
80 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 80 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
81 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 81 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
82 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 82 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
83 #include "chrome/browser/user_style_sheet_watcher.h" | 83 #include "chrome/browser/user_style_sheet_watcher.h" |
84 #include "chrome/browser/user_style_sheet_watcher_factory.h" | 84 #include "chrome/browser/user_style_sheet_watcher_factory.h" |
85 #include "chrome/browser/validation_message_message_filter.h" | 85 #include "chrome/browser/validation_message_message_filter.h" |
| 86 #include "chrome/browser/webview/webview_guest.h" |
86 #include "chrome/common/child_process_logging.h" | 87 #include "chrome/common/child_process_logging.h" |
87 #include "chrome/common/chrome_constants.h" | 88 #include "chrome/common/chrome_constants.h" |
88 #include "chrome/common/chrome_paths.h" | 89 #include "chrome/common/chrome_paths.h" |
89 #include "chrome/common/chrome_process_type.h" | 90 #include "chrome/common/chrome_process_type.h" |
90 #include "chrome/common/chrome_switches.h" | 91 #include "chrome/common/chrome_switches.h" |
91 #include "chrome/common/extensions/background_info.h" | 92 #include "chrome/common/extensions/background_info.h" |
92 #include "chrome/common/extensions/extension.h" | 93 #include "chrome/common/extensions/extension.h" |
93 #include "chrome/common/extensions/extension_process_policy.h" | 94 #include "chrome/common/extensions/extension_process_policy.h" |
94 #include "chrome/common/extensions/extension_set.h" | 95 #include "chrome/common/extensions/extension_set.h" |
95 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" | 96 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" |
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
688 const Extension* extension = service->extensions()-> | 689 const Extension* extension = service->extensions()-> |
689 GetExtensionOrAppByURL(ExtensionURLInfo(url)); | 690 GetExtensionOrAppByURL(ExtensionURLInfo(url)); |
690 if (!extension) | 691 if (!extension) |
691 return; | 692 return; |
692 std::vector<ExtensionMsg_Loaded_Params> extensions; | 693 std::vector<ExtensionMsg_Loaded_Params> extensions; |
693 extensions.push_back(ExtensionMsg_Loaded_Params(extension)); | 694 extensions.push_back(ExtensionMsg_Loaded_Params(extension)); |
694 guest_web_contents->Send(new ExtensionMsg_Loaded(extensions)); | 695 guest_web_contents->Send(new ExtensionMsg_Loaded(extensions)); |
695 // TODO(fsamuel): This should be replaced with WebViewGuest or AdViewGuest | 696 // TODO(fsamuel): This should be replaced with WebViewGuest or AdViewGuest |
696 // once they are ready. | 697 // once they are ready. |
697 extensions::TabHelper::CreateForWebContents(guest_web_contents); | 698 extensions::TabHelper::CreateForWebContents(guest_web_contents); |
| 699 new WebViewGuest(guest_web_contents, embedder_web_contents, extension->id()); |
698 } | 700 } |
699 | 701 |
700 void ChromeContentBrowserClient::RenderProcessHostCreated( | 702 void ChromeContentBrowserClient::RenderProcessHostCreated( |
701 content::RenderProcessHost* host) { | 703 content::RenderProcessHost* host) { |
702 int id = host->GetID(); | 704 int id = host->GetID(); |
703 Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext()); | 705 Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext()); |
704 net::URLRequestContextGetter* context = | 706 net::URLRequestContextGetter* context = |
705 profile->GetRequestContextForRenderProcess(id); | 707 profile->GetRequestContextForRenderProcess(id); |
706 | 708 |
707 host->GetChannel()->AddFilter(new ChromeRenderMessageFilter( | 709 host->GetChannel()->AddFilter(new ChromeRenderMessageFilter( |
(...skipping 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2316 #if defined(USE_NSS) | 2318 #if defined(USE_NSS) |
2317 crypto::CryptoModuleBlockingPasswordDelegate* | 2319 crypto::CryptoModuleBlockingPasswordDelegate* |
2318 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2320 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2319 const GURL& url) { | 2321 const GURL& url) { |
2320 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2322 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2321 chrome::kCryptoModulePasswordKeygen, url.host()); | 2323 chrome::kCryptoModulePasswordKeygen, url.host()); |
2322 } | 2324 } |
2323 #endif | 2325 #endif |
2324 | 2326 |
2325 } // namespace chrome | 2327 } // namespace chrome |
OLD | NEW |