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

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

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 7 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 namespace user_prefs {
28 class PrefRegistrySyncable; 29 class PrefRegistrySyncable;
30 }
29 31
30 namespace chrome { 32 namespace chrome {
31 33
32 class ChromeContentBrowserClient : public content::ContentBrowserClient { 34 class ChromeContentBrowserClient : public content::ContentBrowserClient {
33 public: 35 public:
34 ChromeContentBrowserClient(); 36 ChromeContentBrowserClient();
35 virtual ~ChromeContentBrowserClient(); 37 virtual ~ChromeContentBrowserClient();
36 38
37 static void RegisterUserPrefs(PrefRegistrySyncable* registry); 39 static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
38 40
39 // Notification that the application locale has changed. This allows us to 41 // Notification that the application locale has changed. This allows us to
40 // update our I/O thread cache of this value. 42 // update our I/O thread cache of this value.
41 static void SetApplicationLocale(const std::string& locale); 43 static void SetApplicationLocale(const std::string& locale);
42 44
43 virtual content::BrowserMainParts* CreateBrowserMainParts( 45 virtual content::BrowserMainParts* CreateBrowserMainParts(
44 const content::MainFunctionParams& parameters) OVERRIDE; 46 const content::MainFunctionParams& parameters) OVERRIDE;
45 virtual std::string GetStoragePartitionIdForSite( 47 virtual std::string GetStoragePartitionIdForSite(
46 content::BrowserContext* browser_context, 48 content::BrowserContext* browser_context,
47 const GURL& site) OVERRIDE; 49 const GURL& site) OVERRIDE;
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 private: 256 private:
255 // Set of origins that can use TCP/UDP private APIs from NaCl. 257 // Set of origins that can use TCP/UDP private APIs from NaCl.
256 std::set<std::string> allowed_socket_origins_; 258 std::set<std::string> allowed_socket_origins_;
257 259
258 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 260 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
259 }; 261 };
260 262
261 } // namespace chrome 263 } // namespace chrome
262 264
263 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 265 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698