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

Side by Side Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 140343002: extensions: Relocate pref name constants. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add missing include for mac Created 6 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/extensions/chrome_extensions_browser_client.h" 5 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/version.h" 8 #include "base/version.h"
9 #include "chrome/browser/app_mode/app_mode_utils.h" 9 #include "chrome/browser/app_mode/app_mode_utils.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/extensions/chrome_app_sorting.h" 11 #include "chrome/browser/extensions/chrome_app_sorting.h"
12 #include "chrome/browser/extensions/extension_prefs.h" 12 #include "chrome/browser/extensions/extension_prefs.h"
13 #include "chrome/browser/extensions/extension_system.h" 13 #include "chrome/browser/extensions/extension_system.h"
14 #include "chrome/browser/extensions/extension_system_factory.h" 14 #include "chrome/browser/extensions/extension_system_factory.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
17 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" 17 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
18 #include "chrome/browser/ui/browser_finder.h" 18 #include "chrome/browser/ui/browser_finder.h"
19 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 19 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/chrome_version_info.h" 21 #include "chrome/common/chrome_version_info.h"
22 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
23 #include "extensions/browser/pref_names.h"
23 24
24 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
25 #include "chromeos/chromeos_switches.h" 26 #include "chromeos/chromeos_switches.h"
26 #endif 27 #endif
27 28
28 namespace extensions { 29 namespace extensions {
29 30
30 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {} 31 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {}
31 32
32 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {} 33 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {}
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(profile); 125 ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(profile);
125 if (!extension_prefs) 126 if (!extension_prefs)
126 return false; 127 return false;
127 128
128 // If we're inside a browser test, then assume prefs are all up-to-date. 129 // If we're inside a browser test, then assume prefs are all up-to-date.
129 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) 130 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
130 return false; 131 return false;
131 132
132 PrefService* pref_service = extension_prefs->pref_service(); 133 PrefService* pref_service = extension_prefs->pref_service();
133 base::Version last_version; 134 base::Version last_version;
134 if (pref_service->HasPrefPath(prefs::kExtensionsLastChromeVersion)) { 135 if (pref_service->HasPrefPath(pref_names::kLastChromeVersion)) {
135 std::string last_version_str = 136 std::string last_version_str =
136 pref_service->GetString(prefs::kExtensionsLastChromeVersion); 137 pref_service->GetString(pref_names::kLastChromeVersion);
137 last_version = base::Version(last_version_str); 138 last_version = base::Version(last_version_str);
138 } 139 }
139 140
140 chrome::VersionInfo current_version_info; 141 chrome::VersionInfo current_version_info;
141 std::string current_version = current_version_info.Version(); 142 std::string current_version = current_version_info.Version();
142 pref_service->SetString(prefs::kExtensionsLastChromeVersion, 143 pref_service->SetString(pref_names::kLastChromeVersion,
143 current_version); 144 current_version);
144 145
145 // If there was no version string in prefs, assume we're out of date. 146 // If there was no version string in prefs, assume we're out of date.
146 if (!last_version.IsValid()) 147 if (!last_version.IsValid())
147 return true; 148 return true;
148 149
149 return last_version.IsOlderThan(current_version); 150 return last_version.IsOlderThan(current_version);
150 } 151 }
151 152
152 scoped_ptr<AppSorting> ChromeExtensionsBrowserClient::CreateAppSorting() { 153 scoped_ptr<AppSorting> ChromeExtensionsBrowserClient::CreateAppSorting() {
(...skipping 15 matching lines...) Expand all
168 dependencies.push_back(ExtensionSystemSharedFactory::GetInstance()); 169 dependencies.push_back(ExtensionSystemSharedFactory::GetInstance());
169 return dependencies; 170 return dependencies;
170 } 171 }
171 172
172 ExtensionSystem* ChromeExtensionsBrowserClient::CreateExtensionSystem( 173 ExtensionSystem* ChromeExtensionsBrowserClient::CreateExtensionSystem(
173 content::BrowserContext* context) { 174 content::BrowserContext* context) {
174 return new ExtensionSystemImpl(static_cast<Profile*>(context)); 175 return new ExtensionSystemImpl(static_cast<Profile*>(context));
175 } 176 }
176 177
177 } // namespace extensions 178 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698