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

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

Issue 9133023: Fix default apps losing the "bookmark app" bit once they get updated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix method naming. Created 8 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/external_extension_provider_impl.h" 5 #include "chrome/browser/extensions/external_extension_provider_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/linked_ptr.h" 10 #include "base/memory/linked_ptr.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 } 230 }
231 231
232 void ExternalExtensionProviderImpl::ServiceShutdown() { 232 void ExternalExtensionProviderImpl::ServiceShutdown() {
233 service_ = NULL; 233 service_ = NULL;
234 } 234 }
235 235
236 bool ExternalExtensionProviderImpl::IsReady() const { 236 bool ExternalExtensionProviderImpl::IsReady() const {
237 return ready_; 237 return ready_;
238 } 238 }
239 239
240 int ExternalExtensionProviderImpl::GetCreationFlags() const {
241 return creation_flags_;
242 }
243
240 bool ExternalExtensionProviderImpl::HasExtension( 244 bool ExternalExtensionProviderImpl::HasExtension(
241 const std::string& id) const { 245 const std::string& id) const {
242 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 246 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
243 CHECK(prefs_.get()); 247 CHECK(prefs_.get());
244 CHECK(ready_); 248 CHECK(ready_);
245 return prefs_->HasKey(id); 249 return prefs_->HasKey(id);
246 } 250 }
247 251
248 bool ExternalExtensionProviderImpl::GetExtensionDetails( 252 bool ExternalExtensionProviderImpl::GetExtensionDetails(
249 const std::string& id, Extension::Location* location, 253 const std::string& id, Extension::Location* location,
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 profile, 366 profile,
363 service, 367 service,
364 new ExternalPrefExtensionLoader( 368 new ExternalPrefExtensionLoader(
365 chrome::DIR_DEFAULT_APPS, 369 chrome::DIR_DEFAULT_APPS,
366 ExternalPrefExtensionLoader::NONE), 370 ExternalPrefExtensionLoader::NONE),
367 Extension::EXTERNAL_PREF, 371 Extension::EXTERNAL_PREF,
368 Extension::INVALID, 372 Extension::INVALID,
369 Extension::FROM_BOOKMARK))); 373 Extension::FROM_BOOKMARK)));
370 #endif 374 #endif
371 } 375 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698