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

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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/sync/glue/session_model_associator.h" 5 #include "chrome/browser/sync/glue/session_model_associator.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 20 matching lines...) Expand all
31 #include "content/public/browser/notification_service.h" 31 #include "content/public/browser/notification_service.h"
32 #include "content/public/browser/notification_details.h" 32 #include "content/public/browser/notification_details.h"
33 #if defined(OS_LINUX) 33 #if defined(OS_LINUX)
34 #include "base/linux_util.h" 34 #include "base/linux_util.h"
35 #elif defined(OS_WIN) 35 #elif defined(OS_WIN)
36 #include <windows.h> 36 #include <windows.h>
37 #endif 37 #endif
38 38
39 namespace browser_sync { 39 namespace browser_sync {
40 40
41 using content::BrowserThread;
41 using syncable::SESSIONS; 42 using syncable::SESSIONS;
42 43
43 namespace { 44 namespace {
44 static const char kNoSessionsFolderError[] = 45 static const char kNoSessionsFolderError[] =
45 "Server did not create the top-level sessions node. We " 46 "Server did not create the top-level sessions node. We "
46 "might be running against an out-of-date server."; 47 "might be running against an out-of-date server.";
47 48
48 // The maximum number of navigations in each direction we care to sync. 49 // The maximum number of navigations in each direction we care to sync.
49 static const int kMaxSyncNavigationCount = 6; 50 static const int kMaxSyncNavigationCount = 6;
50 51
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1284 char computer_name[MAX_COMPUTERNAME_LENGTH + 1]; 1285 char computer_name[MAX_COMPUTERNAME_LENGTH + 1];
1285 DWORD size = sizeof(computer_name); 1286 DWORD size = sizeof(computer_name);
1286 if (GetComputerNameA(computer_name, &size)) { 1287 if (GetComputerNameA(computer_name, &size)) {
1287 return computer_name; 1288 return computer_name;
1288 } 1289 }
1289 return std::string(); 1290 return std::string();
1290 } 1291 }
1291 #endif 1292 #endif
1292 1293
1293 } // namespace browser_sync 1294 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/session_change_processor.cc ('k') | chrome/browser/sync/glue/shared_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698