| 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 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 content::WebContentsView* | 400 content::WebContentsView* |
| 401 ChromeContentBrowserClient::OverrideCreateWebContentsView( | 401 ChromeContentBrowserClient::OverrideCreateWebContentsView( |
| 402 WebContents* web_contents, | 402 WebContents* web_contents, |
| 403 content::RenderViewHostDelegateView** render_view_host_delegate_view) { | 403 content::RenderViewHostDelegateView** render_view_host_delegate_view) { |
| 404 return NULL; | 404 return NULL; |
| 405 } | 405 } |
| 406 | 406 |
| 407 content::WebContentsViewDelegate* | 407 content::WebContentsViewDelegate* |
| 408 ChromeContentBrowserClient::GetWebContentsViewDelegate( | 408 ChromeContentBrowserClient::GetWebContentsViewDelegate( |
| 409 content::WebContents* web_contents) { | 409 content::WebContents* web_contents) { |
| 410 return browser::CreateWebContentsViewDelegate(web_contents); | 410 return chrome::CreateWebContentsViewDelegate(web_contents); |
| 411 } | 411 } |
| 412 | 412 |
| 413 void ChromeContentBrowserClient::RenderViewHostCreated( | 413 void ChromeContentBrowserClient::RenderViewHostCreated( |
| 414 RenderViewHost* render_view_host) { | 414 RenderViewHost* render_view_host) { |
| 415 | 415 |
| 416 SiteInstance* site_instance = render_view_host->GetSiteInstance(); | 416 SiteInstance* site_instance = render_view_host->GetSiteInstance(); |
| 417 Profile* profile = Profile::FromBrowserContext( | 417 Profile* profile = Profile::FromBrowserContext( |
| 418 site_instance->GetBrowserContext()); | 418 site_instance->GetBrowserContext()); |
| 419 | 419 |
| 420 new ChromeRenderViewHostObserver(render_view_host, | 420 new ChromeRenderViewHostObserver(render_view_host, |
| (...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1647 io_thread_application_locale_ = locale; | 1647 io_thread_application_locale_ = locale; |
| 1648 } | 1648 } |
| 1649 | 1649 |
| 1650 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 1650 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
| 1651 const std::string& locale) { | 1651 const std::string& locale) { |
| 1652 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1652 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 1653 io_thread_application_locale_ = locale; | 1653 io_thread_application_locale_ = locale; |
| 1654 } | 1654 } |
| 1655 | 1655 |
| 1656 } // namespace chrome | 1656 } // namespace chrome |
| OLD | NEW |