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

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: One more merge to head. Created 7 years, 10 months 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 #endif 18 #endif
19 19
20 namespace content { 20 namespace content {
21 class QuotaPermissionContext; 21 class QuotaPermissionContext;
22 } 22 }
23 23
24 namespace extensions { 24 namespace extensions {
25 class Extension; 25 class Extension;
26 } 26 }
27 27
28 class PrefServiceSyncable; 28 class PrefRegistrySyncable;
29 29
30 namespace chrome { 30 namespace chrome {
31 31
32 class ChromeContentBrowserClient : public content::ContentBrowserClient { 32 class ChromeContentBrowserClient : public content::ContentBrowserClient {
33 public: 33 public:
34 ChromeContentBrowserClient(); 34 ChromeContentBrowserClient();
35 virtual ~ChromeContentBrowserClient(); 35 virtual ~ChromeContentBrowserClient();
36 36
37 static void RegisterUserPrefs(PrefServiceSyncable* prefs); 37 static void RegisterUserPrefs(PrefRegistrySyncable* registry);
38 38
39 virtual content::BrowserMainParts* CreateBrowserMainParts( 39 virtual content::BrowserMainParts* CreateBrowserMainParts(
40 const content::MainFunctionParams& parameters) OVERRIDE; 40 const content::MainFunctionParams& parameters) OVERRIDE;
41 virtual content::WebContentsView* OverrideCreateWebContentsView( 41 virtual content::WebContentsView* OverrideCreateWebContentsView(
42 content::WebContents* web_contents, 42 content::WebContents* web_contents,
43 content::RenderViewHostDelegateView** render_view_host_delegate_view) 43 content::RenderViewHostDelegateView** render_view_host_delegate_view)
44 OVERRIDE; 44 OVERRIDE;
45 virtual std::string GetStoragePartitionIdForSite( 45 virtual std::string GetStoragePartitionIdForSite(
46 content::BrowserContext* browser_context, 46 content::BrowserContext* browser_context,
47 const GURL& site) OVERRIDE; 47 const GURL& site) OVERRIDE;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 // Cached version of the locale so we can return the locale on the I/O 266 // Cached version of the locale so we can return the locale on the I/O
267 // thread. 267 // thread.
268 std::string io_thread_application_locale_; 268 std::string io_thread_application_locale_;
269 269
270 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 270 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
271 }; 271 };
272 272
273 } // namespace chrome 273 } // namespace chrome
274 274
275 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 275 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698