| Index: chrome/browser/extensions/pending_extension_manager.cc
|
| diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
|
| index 130f11bcf75fce4a170894742ea2e49fde0ef9b8..175afa930fe21e3be654e63a81987cad6605d384 100644
|
| --- a/chrome/browser/extensions/pending_extension_manager.cc
|
| +++ b/chrome/browser/extensions/pending_extension_manager.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/extensions/pending_extension_manager.h"
|
|
|
| +#include <algorithm>
|
| +
|
| #include "base/logging.h"
|
| #include "base/stl_util.h"
|
| #include "base/version.h"
|
| @@ -12,8 +14,6 @@
|
| #include "chrome/common/extensions/extension.h"
|
| #include "content/public/browser/browser_thread.h"
|
|
|
| -#include <algorithm>
|
| -
|
| using content::BrowserThread;
|
|
|
| namespace {
|
| @@ -73,6 +73,18 @@ bool PendingExtensionManager::IsIdPending(const std::string& id) const {
|
| return false;
|
| }
|
|
|
| +bool PendingExtensionManager::HasPendingExtensionFromSync() const {
|
| + PendingExtensionList::const_iterator iter;
|
| + for (iter = pending_extension_list_.begin();
|
| + iter != pending_extension_list_.end();
|
| + ++iter) {
|
| + if (iter->is_from_sync())
|
| + return true;
|
| + }
|
| +
|
| + return false;
|
| +}
|
| +
|
| bool PendingExtensionManager::AddFromSync(
|
| const std::string& id,
|
| const GURL& update_url,
|
|
|