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

Side by Side Diff: extensions/shell/browser/shell_prefs.cc

Issue 1543053002: Switch to standard integer types in extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@int-extensions-browser
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "extensions/shell/browser/shell_prefs.h" 5 #include "extensions/shell/browser/shell_prefs.h"
6 6
7 #include "base/prefs/json_pref_store.h" 7 #include "base/prefs/json_pref_store.h"
8 #include "base/prefs/pref_filter.h" 8 #include "base/prefs/pref_filter.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/prefs/pref_service_factory.h" 11 #include "base/prefs/pref_service_factory.h"
12 #include "build/build_config.h"
12 #include "components/pref_registry/pref_registry_syncable.h" 13 #include "components/pref_registry/pref_registry_syncable.h"
13 #include "components/user_prefs/user_prefs.h" 14 #include "components/user_prefs/user_prefs.h"
14 #include "content/public/browser/browser_context.h" 15 #include "content/public/browser/browser_context.h"
15 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
16 #include "extensions/browser/extension_prefs.h" 17 #include "extensions/browser/extension_prefs.h"
17 18
18 #if defined(OS_CHROMEOS) 19 #if defined(OS_CHROMEOS)
19 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 20 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
20 #endif 21 #endif
21 22
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 ExtensionPrefs::RegisterProfilePrefs(pref_registry); 82 ExtensionPrefs::RegisterProfilePrefs(pref_registry);
82 83
83 scoped_ptr<PrefService> pref_service = factory.Create(pref_registry); 84 scoped_ptr<PrefService> pref_service = factory.Create(pref_registry);
84 user_prefs::UserPrefs::Set(browser_context, pref_service.get()); 85 user_prefs::UserPrefs::Set(browser_context, pref_service.get());
85 return pref_service; 86 return pref_service;
86 } 87 }
87 88
88 } // namespace shell_prefs 89 } // namespace shell_prefs
89 90
90 } // namespace extensions 91 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_oauth2_token_service_delegate.h ('k') | extensions/shell/browser/shell_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698