Chromium Code Reviews| 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 namespace content { | 16 namespace content { |
| 17 class QuotaPermissionContext; | 17 class QuotaPermissionContext; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace extensions { | 20 namespace extensions { |
| 21 class Extension; | 21 class Extension; |
| 22 } | 22 } |
| 23 | 23 |
| 24 class PrefService; | 24 class PrefService; |
| 25 | 25 |
| 26 #if defined(OS_ANDROID) | |
|
Lei Zhang
2012/10/19 23:22:34
nit: this goes above the forward declarations.
Jay Civelli
2012/10/22 22:09:48
Done.
| |
| 27 #include "base/memory/scoped_ptr.h" | |
| 28 #include "chrome/browser/android/crash_dump_manager.h" | |
| 29 #endif | |
| 30 | |
| 26 namespace chrome { | 31 namespace chrome { |
| 27 | 32 |
| 28 class ChromeContentBrowserClient : public content::ContentBrowserClient { | 33 class ChromeContentBrowserClient : public content::ContentBrowserClient { |
| 29 public: | 34 public: |
| 30 ChromeContentBrowserClient(); | 35 ChromeContentBrowserClient(); |
| 31 virtual ~ChromeContentBrowserClient(); | 36 virtual ~ChromeContentBrowserClient(); |
| 32 | 37 |
| 33 static void RegisterUserPrefs(PrefService* prefs); | 38 static void RegisterUserPrefs(PrefService* prefs); |
| 34 | 39 |
| 35 virtual content::BrowserMainParts* CreateBrowserMainParts( | 40 virtual content::BrowserMainParts* CreateBrowserMainParts( |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 226 private: | 231 private: |
| 227 // Sets io_thread_application_locale_ to the given value. | 232 // Sets io_thread_application_locale_ to the given value. |
| 228 void SetApplicationLocaleOnIOThread(const std::string& locale); | 233 void SetApplicationLocaleOnIOThread(const std::string& locale); |
| 229 | 234 |
| 230 // Helper function for getting the storage partition id from an Extension | 235 // Helper function for getting the storage partition id from an Extension |
| 231 // object. | 236 // object. |
| 232 std::string GetStoragePartitionIdForExtension( | 237 std::string GetStoragePartitionIdForExtension( |
| 233 content::BrowserContext* browser_context, | 238 content::BrowserContext* browser_context, |
| 234 const extensions::Extension* extension); | 239 const extensions::Extension* extension); |
| 235 | 240 |
| 241 #if defined(OS_ANDROID) | |
| 242 void InitCrashDumpManager(); | |
| 243 | |
| 244 scoped_ptr<CrashDumpManager> crash_dump_manager_; | |
|
Lei Zhang
2012/10/19 23:22:34
jam: is this the right place to put this?
| |
| 245 #endif | |
| 246 | |
| 236 // Set of origins that can use TCP/UDP private APIs from NaCl. | 247 // Set of origins that can use TCP/UDP private APIs from NaCl. |
| 237 std::set<std::string> allowed_socket_origins_; | 248 std::set<std::string> allowed_socket_origins_; |
| 238 | 249 |
| 239 // Cached version of the locale so we can return the locale on the I/O | 250 // Cached version of the locale so we can return the locale on the I/O |
| 240 // thread. | 251 // thread. |
| 241 std::string io_thread_application_locale_; | 252 std::string io_thread_application_locale_; |
| 242 | 253 |
| 243 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 254 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 244 }; | 255 }; |
| 245 | 256 |
| 246 } // namespace chrome | 257 } // namespace chrome |
| 247 | 258 |
| 248 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 259 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |