| 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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "content/public/browser/content_browser_client.h" | 14 #include "content/public/browser/content_browser_client.h" |
| 15 | 15 |
| 16 #if defined(OS_ANDROID) | 16 #if defined(OS_ANDROID) |
| 17 #include "base/memory/scoped_ptr.h" | 17 #include "base/memory/scoped_ptr.h" |
| 18 #include "chrome/browser/android/crash_dump_manager.h" | |
| 19 #endif | 18 #endif |
| 20 | 19 |
| 21 namespace content { | 20 namespace content { |
| 22 class QuotaPermissionContext; | 21 class QuotaPermissionContext; |
| 23 } | 22 } |
| 24 | 23 |
| 25 namespace extensions { | 24 namespace extensions { |
| 26 class Extension; | 25 class Extension; |
| 27 } | 26 } |
| 28 | 27 |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 #endif | 225 #endif |
| 227 | 226 |
| 228 // Notification that the application locale has changed. This allows us to | 227 // Notification that the application locale has changed. This allows us to |
| 229 // update our I/O thread cache of this value. | 228 // update our I/O thread cache of this value. |
| 230 void SetApplicationLocale(const std::string& locale); | 229 void SetApplicationLocale(const std::string& locale); |
| 231 | 230 |
| 232 private: | 231 private: |
| 233 // Sets io_thread_application_locale_ to the given value. | 232 // Sets io_thread_application_locale_ to the given value. |
| 234 void SetApplicationLocaleOnIOThread(const std::string& locale); | 233 void SetApplicationLocaleOnIOThread(const std::string& locale); |
| 235 | 234 |
| 236 #if defined(OS_ANDROID) | |
| 237 void InitCrashDumpManager(); | |
| 238 | |
| 239 scoped_ptr<CrashDumpManager> crash_dump_manager_; | |
| 240 #endif | |
| 241 | |
| 242 // Set of origins that can use TCP/UDP private APIs from NaCl. | 235 // Set of origins that can use TCP/UDP private APIs from NaCl. |
| 243 std::set<std::string> allowed_socket_origins_; | 236 std::set<std::string> allowed_socket_origins_; |
| 244 | 237 |
| 245 // Cached version of the locale so we can return the locale on the I/O | 238 // Cached version of the locale so we can return the locale on the I/O |
| 246 // thread. | 239 // thread. |
| 247 std::string io_thread_application_locale_; | 240 std::string io_thread_application_locale_; |
| 248 | 241 |
| 249 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 242 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 250 }; | 243 }; |
| 251 | 244 |
| 252 } // namespace chrome | 245 } // namespace chrome |
| 253 | 246 |
| 254 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 247 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |