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 "content/shell/shell_content_browser_client.h" | 5 #include "content/shell/shell_content_browser_client.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "content/browser/webui/empty_web_ui_factory.h" | 8 #include "content/browser/webui/empty_web_ui_factory.h" |
9 #include "content/shell/shell.h" | 9 #include "content/shell/shell.h" |
10 #include "content/shell/shell_browser_main.h" | 10 #include "content/shell/shell_browser_main.h" |
| 11 #include "content/shell/shell_render_view_host_observer.h" |
11 #include "googleurl/src/gurl.h" | 12 #include "googleurl/src/gurl.h" |
12 #include "third_party/skia/include/core/SkBitmap.h" | 13 #include "third_party/skia/include/core/SkBitmap.h" |
13 #include "webkit/glue/webpreferences.h" | 14 #include "webkit/glue/webpreferences.h" |
14 | 15 |
15 #if defined(OS_WIN) | 16 #if defined(OS_WIN) |
16 #include "content/browser/tab_contents/tab_contents.h" | 17 #include "content/browser/tab_contents/tab_contents.h" |
17 #include "content/browser/tab_contents/tab_contents_view_win.h" | 18 #include "content/browser/tab_contents/tab_contents_view_win.h" |
18 #include "content/common/view_messages.h" | 19 #include "content/common/view_messages.h" |
19 #elif defined(OS_LINUX) | 20 #elif defined(OS_LINUX) |
20 #include "content/browser/tab_contents/tab_contents_view_gtk.h" | 21 #include "content/browser/tab_contents/tab_contents_view_gtk.h" |
(...skipping 19 matching lines...) Expand all Loading... |
40 return new TabContentsViewWin(web_contents); | 41 return new TabContentsViewWin(web_contents); |
41 #elif defined(OS_LINUX) | 42 #elif defined(OS_LINUX) |
42 return new TabContentsViewGtk(web_contents, NULL); | 43 return new TabContentsViewGtk(web_contents, NULL); |
43 #else | 44 #else |
44 return NULL; | 45 return NULL; |
45 #endif | 46 #endif |
46 } | 47 } |
47 | 48 |
48 void ShellContentBrowserClient::RenderViewHostCreated( | 49 void ShellContentBrowserClient::RenderViewHostCreated( |
49 RenderViewHost* render_view_host) { | 50 RenderViewHost* render_view_host) { |
| 51 new ShellRenderViewHostObserver(render_view_host); |
50 } | 52 } |
51 | 53 |
52 void ShellContentBrowserClient::RenderProcessHostCreated( | 54 void ShellContentBrowserClient::RenderProcessHostCreated( |
53 RenderProcessHost* host) { | 55 RenderProcessHost* host) { |
54 } | 56 } |
55 | 57 |
56 WebUIFactory* ShellContentBrowserClient::GetWebUIFactory() { | 58 WebUIFactory* ShellContentBrowserClient::GetWebUIFactory() { |
57 // Return an empty factory so callsites don't have to check for NULL. | 59 // Return an empty factory so callsites don't have to check for NULL. |
58 return EmptyWebUIFactory::GetInstance(); | 60 return EmptyWebUIFactory::GetInstance(); |
59 } | 61 } |
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
316 #endif | 318 #endif |
317 | 319 |
318 #if defined(USE_NSS) | 320 #if defined(USE_NSS) |
319 crypto::CryptoModuleBlockingPasswordDelegate* | 321 crypto::CryptoModuleBlockingPasswordDelegate* |
320 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { | 322 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { |
321 return NULL; | 323 return NULL; |
322 } | 324 } |
323 #endif | 325 #endif |
324 | 326 |
325 } // namespace content | 327 } // namespace content |
OLD | NEW |