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

Unified Diff: sync/sessions/sync_session_context.h

Issue 10387107: Cleanup: Remove unneeded scoped_ptr.h includes from ppapi, printing, remoting, and sync. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « sync/internal_api/all_status.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/sync_session_context.h
===================================================================
--- sync/sessions/sync_session_context.h (revision 137269)
+++ sync/sessions/sync_session_context.h (working copy)
@@ -21,9 +21,9 @@
#include <map>
#include <string>
+#include <vector>
#include "base/gtest_prod_util.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#include "sync/engine/model_safe_worker.h"
#include "sync/engine/syncer_types.h"
@@ -89,7 +89,7 @@
bool notifications_enabled() { return notifications_enabled_; }
// Account name, set once a directory has been opened.
- void set_account_name(const std::string name) {
+ void set_account_name(const std::string& name) {
DCHECK(account_name_.empty());
account_name_ = name;
}
@@ -200,7 +200,8 @@
}
~ScopedSessionContextConflictResolver() {
context_->resolver_ = NULL;
- }
+ }
+
private:
SyncSessionContext* context_;
ConflictResolver* resolver_;
« no previous file with comments | « sync/internal_api/all_status.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698