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

Side by Side Diff: chrome/browser/sync/glue/session_model_associator.h

Issue 26594002: Chrome sync: Put WeakPtrFactory members at the end (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge (see prior patch for try jobs) Created 7 years, 2 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_ 5 #ifndef CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
6 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_ 6 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 // Number of days without activity after which we consider a session to be 365 // Number of days without activity after which we consider a session to be
366 // stale and a candidate for garbage collection. 366 // stale and a candidate for garbage collection.
367 size_t stale_session_threshold_days_; 367 size_t stale_session_threshold_days_;
368 368
369 // To avoid certain checks not applicable to tests. 369 // To avoid certain checks not applicable to tests.
370 bool setup_for_test_; 370 bool setup_for_test_;
371 371
372 // During integration tests, we sometimes need to block until a local change 372 // During integration tests, we sometimes need to block until a local change
373 // is made. 373 // is made.
374 bool waiting_for_change_; 374 bool waiting_for_change_;
375 base::WeakPtrFactory<SessionModelAssociator> test_weak_factory_;
376 375
377 // Profile being synced. Weak pointer. 376 // Profile being synced. Weak pointer.
378 Profile* const profile_; 377 Profile* const profile_;
379 378
380 DataTypeErrorHandler* error_handler_; 379 DataTypeErrorHandler* error_handler_;
381 380
382 // Our favicon cache. 381 // Our favicon cache.
383 FaviconCache favicon_cache_; 382 FaviconCache favicon_cache_;
384 383
384 base::WeakPtrFactory<SessionModelAssociator> test_weak_factory_;
385
385 DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator); 386 DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
386 }; 387 };
387 388
388 } // namespace browser_sync 389 } // namespace browser_sync
389 390
390 #endif // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_ 391 #endif // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698