| 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 #elif defined(OS_POSIX) | 372 #elif defined(OS_POSIX) |
| 373 main_parts = new ChromeBrowserMainPartsPosix(parameters); | 373 main_parts = new ChromeBrowserMainPartsPosix(parameters); |
| 374 #else | 374 #else |
| 375 NOTREACHED(); | 375 NOTREACHED(); |
| 376 main_parts = new ChromeBrowserMainParts(parameters); | 376 main_parts = new ChromeBrowserMainParts(parameters); |
| 377 #endif | 377 #endif |
| 378 | 378 |
| 379 // Construct additional browser parts. Stages are called in the order in | 379 // Construct additional browser parts. Stages are called in the order in |
| 380 // which they are added. | 380 // which they are added. |
| 381 #if defined(TOOLKIT_GTK) | 381 #if defined(TOOLKIT_GTK) |
| 382 browser::AddGtkToolkitExtraParts(main_parts); | 382 chrome::AddGtkToolkitExtraParts(main_parts); |
| 383 #endif | 383 #endif |
| 384 | 384 |
| 385 #if defined(TOOLKIT_VIEWS) | 385 #if defined(TOOLKIT_VIEWS) |
| 386 browser::AddViewsToolkitExtraParts(main_parts); | 386 chrome::AddViewsToolkitExtraParts(main_parts); |
| 387 #endif | 387 #endif |
| 388 | 388 |
| 389 #if defined(USE_ASH) | 389 #if defined(USE_ASH) |
| 390 browser::AddAshToolkitExtraParts(main_parts); | 390 chrome::AddAshToolkitExtraParts(main_parts); |
| 391 #endif | 391 #endif |
| 392 | 392 |
| 393 #if defined(USE_AURA) | 393 #if defined(USE_AURA) |
| 394 browser::AddAuraToolkitExtraParts(main_parts); | 394 chrome::AddAuraToolkitExtraParts(main_parts); |
| 395 #endif | 395 #endif |
| 396 | 396 |
| 397 return main_parts; | 397 return main_parts; |
| 398 } | 398 } |
| 399 | 399 |
| 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; |
| (...skipping 1242 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 |