components/sessions/serialized_navigation_entry.cc - Issue 16614002: Use a direct include of utf_string_conversions.h in chrome_frame/, chromeos/, cloud_print/, compone…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: components/sessions/serialized_navigation_entry.cc

Issue 16614002: Use a direct include of utf_string_conversions.h in chrome_frame/, chromeos/, cloud_print/, compone… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "components/sessions/serialized_navigation_entry.h"	5 #include "components/sessions/serialized_navigation_entry.h"

6	6

7 #include "base/pickle.h"	7 #include "base/pickle.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "content/public/browser/favicon_status.h"	9 #include "content/public/browser/favicon_status.h"

10 #include "content/public/browser/navigation_controller.h"	10 #include "content/public/browser/navigation_controller.h"

11 #include "content/public/browser/navigation_entry.h"	11 #include "content/public/browser/navigation_entry.h"

12 #include "sync/protocol/session_specifics.pb.h"	12 #include "sync/protocol/session_specifics.pb.h"

13 #include "sync/util/time.h"	13 #include "sync/util/time.h"

14 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"	14 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"

15	15

16 using content::NavigationEntry;	16 using content::NavigationEntry;

17	17

18 namespace sessions {	18 namespace sessions {

(...skipping 447 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
466 for (std::vector<SerializedNavigationEntry>::const_iterator	466 for (std::vector<SerializedNavigationEntry>::const_iterator

467 it = navigations.begin(); it != navigations.end(); ++it) {	467 it = navigations.begin(); it != navigations.end(); ++it) {

468 entries.push_back(	468 entries.push_back(

469 it->ToNavigationEntry(page_id, browser_context).release());	469 it->ToNavigationEntry(page_id, browser_context).release());

470 ++page_id;	470 ++page_id;

471 }	471 }

472 return entries;	472 return entries;

473 }	473 }

474	474

475 } // namespace sessions	475 } // namespace sessions

OLD	NEW