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

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

Issue 23238005: sync: Remove ModelTypeInvalidationMap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sort entries in gyp files Created 7 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/sync/glue/session_model_associator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/sync/glue/session_change_processor.h" 5 #include "chrome/browser/sync/glue/session_change_processor.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/extensions/tab_helper.h" 12 #include "chrome/browser/extensions/tab_helper.h"
13 #include "chrome/browser/favicon/favicon_changed_details.h" 13 #include "chrome/browser/favicon/favicon_changed_details.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/sync/glue/session_model_associator.h" 15 #include "chrome/browser/sync/glue/session_model_associator.h"
16 #include "chrome/browser/sync/glue/synced_tab_delegate.h" 16 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
17 #include "chrome/browser/sync/profile_sync_service.h" 17 #include "chrome/browser/sync/profile_sync_service.h"
18 #include "content/public/browser/navigation_controller.h" 18 #include "content/public/browser/navigation_controller.h"
19 #include "content/public/browser/navigation_entry.h" 19 #include "content/public/browser/navigation_entry.h"
20 #include "content/public/browser/notification_details.h" 20 #include "content/public/browser/notification_details.h"
21 #include "content/public/browser/notification_service.h" 21 #include "content/public/browser/notification_service.h"
22 #include "content/public/browser/notification_source.h" 22 #include "content/public/browser/notification_source.h"
23 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 #include "sync/api/sync_error.h" 24 #include "sync/api/sync_error.h"
25 #include "sync/internal_api/public/base/model_type.h" 25 #include "sync/internal_api/public/base/model_type.h"
26 #include "sync/internal_api/public/base/model_type_invalidation_map.h"
27 #include "sync/internal_api/public/change_record.h" 26 #include "sync/internal_api/public/change_record.h"
28 #include "sync/internal_api/public/read_node.h" 27 #include "sync/internal_api/public/read_node.h"
29 #include "sync/protocol/session_specifics.pb.h" 28 #include "sync/protocol/session_specifics.pb.h"
30 29
31 #if defined(ENABLE_MANAGED_USERS) 30 #if defined(ENABLE_MANAGED_USERS)
32 #include "chrome/browser/managed_mode/managed_user_service.h" 31 #include "chrome/browser/managed_mode/managed_user_service.h"
33 #include "chrome/browser/managed_mode/managed_user_service_factory.h" 32 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
34 #endif 33 #endif
35 34
36 using content::BrowserThread; 35 using content::BrowserThread;
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 ManagedUserService* managed_user_service = 382 ManagedUserService* managed_user_service =
384 ManagedUserServiceFactory::GetForProfile(profile_); 383 ManagedUserServiceFactory::GetForProfile(profile_);
385 managed_user_service->AddNavigationBlockedCallback( 384 managed_user_service->AddNavigationBlockedCallback(
386 base::Bind(&SessionChangeProcessor::OnNavigationBlocked, 385 base::Bind(&SessionChangeProcessor::OnNavigationBlocked,
387 weak_ptr_factory_.GetWeakPtr())); 386 weak_ptr_factory_.GetWeakPtr()));
388 } 387 }
389 #endif 388 #endif
390 } 389 }
391 390
392 } // namespace browser_sync 391 } // namespace browser_sync
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/glue/session_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698