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

Side by Side Diff: chrome/browser/dom_ui/foreign_session_handler.h

Issue 3825005: Fix syncing of sessions. Numerous changes have been made. Currently, the mode... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebased again Created 10 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/dom_ui/foreign_session_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_DOM_UI_FOREIGN_SESSION_HANDLER_H_ 5 #ifndef CHROME_BROWSER_DOM_UI_FOREIGN_SESSION_HANDLER_H_
6 #define CHROME_BROWSER_DOM_UI_FOREIGN_SESSION_HANDLER_H_ 6 #define CHROME_BROWSER_DOM_UI_FOREIGN_SESSION_HANDLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector>
10
9 #include "chrome/browser/dom_ui/dom_ui.h" 11 #include "chrome/browser/dom_ui/dom_ui.h"
10 #include "chrome/browser/sessions/session_service.h" 12 #include "chrome/browser/sessions/session_service.h"
11 #include "chrome/browser/sync/glue/session_model_associator.h" 13 #include "chrome/browser/sync/glue/session_model_associator.h"
12 #include "chrome/common/notification_observer.h" 14 #include "chrome/common/notification_observer.h"
13 #include "chrome/common/notification_registrar.h" 15 #include "chrome/common/notification_registrar.h"
14 16
15 namespace browser_sync { 17 namespace browser_sync {
16 18
17 class ForeignSessionHandler : public DOMMessageHandler, 19 class ForeignSessionHandler : public DOMMessageHandler,
18 public NotificationObserver { 20 public NotificationObserver {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 54
53 // The Registrar used to register ForeignSessionHandler for notifications. 55 // The Registrar used to register ForeignSessionHandler for notifications.
54 NotificationRegistrar registrar_; 56 NotificationRegistrar registrar_;
55 57
56 DISALLOW_COPY_AND_ASSIGN(ForeignSessionHandler); 58 DISALLOW_COPY_AND_ASSIGN(ForeignSessionHandler);
57 }; 59 };
58 60
59 } // namespace browser_sync 61 } // namespace browser_sync
60 62
61 #endif // CHROME_BROWSER_DOM_UI_FOREIGN_SESSION_HANDLER_H_ 63 #endif // CHROME_BROWSER_DOM_UI_FOREIGN_SESSION_HANDLER_H_
62
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/dom_ui/foreign_session_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698