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

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

Issue 11298004: alternate ntp: add "Recent Tabs" submenu to wrench menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased to resolve conflicts Created 8 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/browser_command_controller.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 #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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 void BlockUntilLocalChangeForTest(base::TimeDelta timeout); 226 void BlockUntilLocalChangeForTest(base::TimeDelta timeout);
227 227
228 // Callback for when the session name has been computed. 228 // Callback for when the session name has been computed.
229 void OnSessionNameInitialized(const std::string& name); 229 void OnSessionNameInitialized(const std::string& name);
230 230
231 // If a valid favicon for the page at |url| is found, fills |png_favicon| with 231 // If a valid favicon for the page at |url| is found, fills |png_favicon| with
232 // the png-encoded image and returns true. Else, returns false. 232 // the png-encoded image and returns true. Else, returns false.
233 bool GetSyncedFaviconForPageURL(const std::string& url, 233 bool GetSyncedFaviconForPageURL(const std::string& url,
234 std::string* png_favicon) const; 234 std::string* png_favicon) const;
235 235
236 void SetCurrentMachineTagForTesting(const std::string& machine_tag) {
237 current_machine_tag_ = machine_tag;
238 }
239
236 private: 240 private:
237 friend class SyncSessionModelAssociatorTest; 241 friend class SyncSessionModelAssociatorTest;
238 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, WriteSessionToNode); 242 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, WriteSessionToNode);
239 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, 243 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest,
240 WriteFilledSessionToNode); 244 WriteFilledSessionToNode);
241 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, 245 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest,
242 WriteForeignSessionToNode); 246 WriteForeignSessionToNode);
243 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, TabNodePoolEmpty); 247 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, TabNodePoolEmpty);
244 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, TabNodePoolNonEmpty); 248 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, TabNodePoolNonEmpty);
245 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, ValidTabs); 249 FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, ValidTabs);
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_; 547 std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_;
544 // Map of page URL -> favicon url. 548 // Map of page URL -> favicon url.
545 std::map<std::string, std::string> synced_favicon_pages_; 549 std::map<std::string, std::string> synced_favicon_pages_;
546 550
547 DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator); 551 DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
548 }; 552 };
549 553
550 } // namespace browser_sync 554 } // namespace browser_sync
551 555
552 #endif // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_ 556 #endif // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698