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

Unified Diff: chrome/browser/sync/syncable/directory_manager.cc

Issue 7587009: sync: add DEPS files to subdirs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix include Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/syncable/directory_manager.h ('k') | chrome/browser/sync/syncable/nigori_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/directory_manager.cc
diff --git a/chrome/browser/sync/syncable/directory_manager.cc b/chrome/browser/sync/syncable/directory_manager.cc
index 7f91d5acefa2bce4692a8ca6f86075d0698a0e1a..b98aacbd3d7c7a237d908bc6c7a107c2c63fc9df 100644
--- a/chrome/browser/sync/syncable/directory_manager.cc
+++ b/chrome/browser/sync/syncable/directory_manager.cc
@@ -13,7 +13,6 @@
#include "base/port.h"
#include "base/string_util.h"
#include "chrome/browser/sync/syncable/syncable.h"
-#include "chrome/common/deprecated/event_sys-inl.h"
using browser_sync::Cryptographer;
@@ -22,12 +21,6 @@ namespace syncable {
static const FilePath::CharType kSyncDataDatabaseFilename[] =
FILE_PATH_LITERAL("SyncData.sqlite3");
-DirectoryManagerEvent DirectoryManagerShutdownEvent() {
- DirectoryManagerEvent event;
- event.what_happened = DirectoryManagerEvent::SHUTDOWN;
- return event;
-}
-
// static
const FilePath DirectoryManager::GetSyncDataDatabaseFilename() {
return FilePath(kSyncDataDatabaseFilename);
@@ -40,7 +33,6 @@ const FilePath DirectoryManager::GetSyncDataDatabasePath() const {
DirectoryManager::DirectoryManager(const FilePath& path)
: root_path_(path),
managed_directory_(NULL),
- channel_(new Channel(DirectoryManagerShutdownEvent())),
cryptographer_(new Cryptographer) {
}
@@ -48,7 +40,6 @@ DirectoryManager::~DirectoryManager() {
base::AutoLock lock(lock_);
DCHECK_EQ(managed_directory_, static_cast<Directory*>(NULL))
<< "Dir " << managed_directory_->name() << " not closed!";
- delete channel_;
}
bool DirectoryManager::Open(const std::string& name,
@@ -103,12 +94,6 @@ void DirectoryManager::Close(const std::string& name) {
}
}
- // TODO(timsteele): No lock?!
- // Notify listeners.
- managed_directory_->channel()->NotifyListeners(DIRECTORY_CLOSED);
- DirectoryManagerEvent event = { DirectoryManagerEvent::CLOSED, name };
- channel_->NotifyListeners(event);
-
delete managed_directory_;
managed_directory_ = NULL;
}
« no previous file with comments | « chrome/browser/sync/syncable/directory_manager.h ('k') | chrome/browser/sync/syncable/nigori_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698