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/shell/shell.h" | 8 #include "content/shell/shell.h" |
9 #include "content/shell/shell_browser_main.h" | 9 #include "content/shell/shell_browser_main.h" |
10 #include "content/shell/shell_devtools_delegate.h" | 10 #include "content/shell/shell_devtools_delegate.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 24 matching lines...) Expand all Loading... |
45 return new TabContentsViewWin(web_contents); | 46 return new TabContentsViewWin(web_contents); |
46 #elif defined(OS_LINUX) | 47 #elif defined(OS_LINUX) |
47 return new TabContentsViewGtk(web_contents, NULL); | 48 return new TabContentsViewGtk(web_contents, NULL); |
48 #else | 49 #else |
49 return NULL; | 50 return NULL; |
50 #endif | 51 #endif |
51 } | 52 } |
52 | 53 |
53 void ShellContentBrowserClient::RenderViewHostCreated( | 54 void ShellContentBrowserClient::RenderViewHostCreated( |
54 RenderViewHost* render_view_host) { | 55 RenderViewHost* render_view_host) { |
| 56 new ShellRenderViewHostObserver(render_view_host); |
55 } | 57 } |
56 | 58 |
57 void ShellContentBrowserClient::RenderProcessHostCreated( | 59 void ShellContentBrowserClient::RenderProcessHostCreated( |
58 RenderProcessHost* host) { | 60 RenderProcessHost* host) { |
59 } | 61 } |
60 | 62 |
61 WebUIControllerFactory* ShellContentBrowserClient::GetWebUIControllerFactory() { | 63 WebUIControllerFactory* ShellContentBrowserClient::GetWebUIControllerFactory() { |
62 return NULL; | 64 return NULL; |
63 } | 65 } |
64 | 66 |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 #endif | 322 #endif |
321 | 323 |
322 #if defined(USE_NSS) | 324 #if defined(USE_NSS) |
323 crypto::CryptoModuleBlockingPasswordDelegate* | 325 crypto::CryptoModuleBlockingPasswordDelegate* |
324 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { | 326 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { |
325 return NULL; | 327 return NULL; |
326 } | 328 } |
327 #endif | 329 #endif |
328 | 330 |
329 } // namespace content | 331 } // namespace content |
OLD | NEW |