Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2195)

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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" 18 #include "chrome/browser/android/crash_dump_manager.h"
19 #endif 19 #endif
20 20
21 namespace content { 21 namespace content {
22 class QuotaPermissionContext; 22 class QuotaPermissionContext;
23 } 23 }
24 24
25 namespace extensions { 25 namespace extensions {
26 class Extension; 26 class Extension;
27 } 27 }
28 28
29 class PrefService; 29 class PrefServiceSyncable;
30 30
31 namespace chrome { 31 namespace chrome {
32 32
33 class ChromeContentBrowserClient : public content::ContentBrowserClient { 33 class ChromeContentBrowserClient : public content::ContentBrowserClient {
34 public: 34 public:
35 ChromeContentBrowserClient(); 35 ChromeContentBrowserClient();
36 virtual ~ChromeContentBrowserClient(); 36 virtual ~ChromeContentBrowserClient();
37 37
38 static void RegisterUserPrefs(PrefService* prefs); 38 static void RegisterUserPrefs(PrefServiceSyncable* prefs);
39 39
40 virtual content::BrowserMainParts* CreateBrowserMainParts( 40 virtual content::BrowserMainParts* CreateBrowserMainParts(
41 const content::MainFunctionParams& parameters) OVERRIDE; 41 const content::MainFunctionParams& parameters) OVERRIDE;
42 virtual content::WebContentsView* OverrideCreateWebContentsView( 42 virtual content::WebContentsView* OverrideCreateWebContentsView(
43 content::WebContents* web_contents, 43 content::WebContents* web_contents,
44 content::RenderViewHostDelegateView** render_view_host_delegate_view) 44 content::RenderViewHostDelegateView** render_view_host_delegate_view)
45 OVERRIDE; 45 OVERRIDE;
46 virtual std::string GetStoragePartitionIdForSite( 46 virtual std::string GetStoragePartitionIdForSite(
47 content::BrowserContext* browser_context, 47 content::BrowserContext* browser_context,
48 const GURL& site) OVERRIDE; 48 const GURL& site) OVERRIDE;
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 // Cached version of the locale so we can return the locale on the I/O 252 // Cached version of the locale so we can return the locale on the I/O
253 // thread. 253 // thread.
254 std::string io_thread_application_locale_; 254 std::string io_thread_application_locale_;
255 255
256 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 256 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
257 }; 257 };
258 258
259 } // namespace chrome 259 } // namespace chrome
260 260
261 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 261 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_unittest.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698