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 19 matching lines...) Expand all Loading... | |
30 #include "chrome/browser/extensions/extension_host.h" | 30 #include "chrome/browser/extensions/extension_host.h" |
31 #include "chrome/browser/extensions/extension_info_map.h" | 31 #include "chrome/browser/extensions/extension_info_map.h" |
32 #include "chrome/browser/extensions/extension_process_manager.h" | 32 #include "chrome/browser/extensions/extension_process_manager.h" |
33 #include "chrome/browser/extensions/extension_service.h" | 33 #include "chrome/browser/extensions/extension_service.h" |
34 #include "chrome/browser/extensions/extension_system.h" | 34 #include "chrome/browser/extensions/extension_system.h" |
35 #include "chrome/browser/extensions/extension_web_ui.h" | 35 #include "chrome/browser/extensions/extension_web_ui.h" |
36 #include "chrome/browser/extensions/extension_webkit_preferences.h" | 36 #include "chrome/browser/extensions/extension_webkit_preferences.h" |
37 #include "chrome/browser/extensions/message_handler.h" | 37 #include "chrome/browser/extensions/message_handler.h" |
38 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 38 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
39 #include "chrome/browser/google/google_util.h" | 39 #include "chrome/browser/google/google_util.h" |
40 #include "chrome/browser/gpu_util.h" | |
erikwright (departed)
2012/08/10 19:11:02
??
Jói
2012/08/13 11:47:54
Bad merge resolution, thanks for noticing. Fixed
| |
40 #include "chrome/browser/infobars/infobar_tab_helper.h" | 41 #include "chrome/browser/infobars/infobar_tab_helper.h" |
41 #include "chrome/browser/media/media_internals.h" | 42 #include "chrome/browser/media/media_internals.h" |
42 #include "chrome/browser/net/chrome_net_log.h" | 43 #include "chrome/browser/net/chrome_net_log.h" |
43 #include "chrome/browser/notifications/desktop_notification_service.h" | 44 #include "chrome/browser/notifications/desktop_notification_service.h" |
44 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 45 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
45 #include "chrome/browser/pepper_gtalk_message_filter.h" | 46 #include "chrome/browser/pepper_gtalk_message_filter.h" |
46 #include "chrome/browser/platform_util.h" | 47 #include "chrome/browser/platform_util.h" |
47 #include "chrome/browser/prefs/pref_service.h" | 48 #include "chrome/browser/prefs/pref_service.h" |
48 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 49 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
49 #include "chrome/browser/prerender/prerender_manager.h" | 50 #include "chrome/browser/prerender/prerender_manager.h" |
(...skipping 1631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1681 io_thread_application_locale_ = locale; | 1682 io_thread_application_locale_ = locale; |
1682 } | 1683 } |
1683 | 1684 |
1684 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 1685 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
1685 const std::string& locale) { | 1686 const std::string& locale) { |
1686 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1687 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1687 io_thread_application_locale_ = locale; | 1688 io_thread_application_locale_ = locale; |
1688 } | 1689 } |
1689 | 1690 |
1690 } // namespace chrome | 1691 } // namespace chrome |
OLD | NEW |