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

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

Issue 2338703003: [NTP] Fix article suggestion clicks contributing to Most Visited tiles (Closed)
Patch Set: Add test coverage to HistoryBackend. Created 4 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
OLDNEW
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/core/serialized_navigation_entry.h" 5 #include "components/sessions/core/serialized_navigation_entry.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/pickle.h" 9 #include "base/pickle.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 if (sync_data.navigation_forward_back()) 114 if (sync_data.navigation_forward_back())
115 transition |= ui::PAGE_TRANSITION_FORWARD_BACK; 115 transition |= ui::PAGE_TRANSITION_FORWARD_BACK;
116 if (sync_data.navigation_from_address_bar()) 116 if (sync_data.navigation_from_address_bar())
117 transition |= ui::PAGE_TRANSITION_FROM_ADDRESS_BAR; 117 transition |= ui::PAGE_TRANSITION_FROM_ADDRESS_BAR;
118 if (sync_data.navigation_home_page()) 118 if (sync_data.navigation_home_page())
119 transition |= ui::PAGE_TRANSITION_HOME_PAGE; 119 transition |= ui::PAGE_TRANSITION_HOME_PAGE;
120 if (sync_data.navigation_chain_start()) 120 if (sync_data.navigation_chain_start())
121 transition |= ui::PAGE_TRANSITION_CHAIN_START; 121 transition |= ui::PAGE_TRANSITION_CHAIN_START;
122 if (sync_data.navigation_chain_end()) 122 if (sync_data.navigation_chain_end())
123 transition |= ui::PAGE_TRANSITION_CHAIN_END; 123 transition |= ui::PAGE_TRANSITION_CHAIN_END;
124 if (sync_data.navigation_ignore_for_ntp_tiles())
125 transition |= ui::PAGE_TRANSITION_IGNORE_FOR_NTP_TILES;
124 126
125 navigation.transition_type_ = static_cast<ui::PageTransition>(transition); 127 navigation.transition_type_ = static_cast<ui::PageTransition>(transition);
126 128
127 navigation.timestamp_ = base::Time(); 129 navigation.timestamp_ = base::Time();
128 navigation.search_terms_ = base::UTF8ToUTF16(sync_data.search_terms()); 130 navigation.search_terms_ = base::UTF8ToUTF16(sync_data.search_terms());
129 if (sync_data.has_favicon_url()) 131 if (sync_data.has_favicon_url())
130 navigation.favicon_url_ = GURL(sync_data.favicon_url()); 132 navigation.favicon_url_ = GURL(sync_data.favicon_url());
131 133
132 if (sync_data.has_password_state()) { 134 if (sync_data.has_password_state()) {
133 navigation.password_state_ = 135 navigation.password_state_ =
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 (transition_type_ & ui::PAGE_TRANSITION_FORWARD_BACK) != 0); 430 (transition_type_ & ui::PAGE_TRANSITION_FORWARD_BACK) != 0);
429 sync_data.set_navigation_from_address_bar( 431 sync_data.set_navigation_from_address_bar(
430 (transition_type_ & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0); 432 (transition_type_ & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0);
431 sync_data.set_navigation_home_page( 433 sync_data.set_navigation_home_page(
432 (transition_type_ & ui::PAGE_TRANSITION_HOME_PAGE) != 0); 434 (transition_type_ & ui::PAGE_TRANSITION_HOME_PAGE) != 0);
433 sync_data.set_navigation_chain_start( 435 sync_data.set_navigation_chain_start(
434 (transition_type_ & ui::PAGE_TRANSITION_CHAIN_START) != 0); 436 (transition_type_ & ui::PAGE_TRANSITION_CHAIN_START) != 0);
435 sync_data.set_navigation_chain_end( 437 sync_data.set_navigation_chain_end(
436 (transition_type_ & ui::PAGE_TRANSITION_CHAIN_END) != 0); 438 (transition_type_ & ui::PAGE_TRANSITION_CHAIN_END) != 0);
437 439
440 if ((transition_type_ & ui::PAGE_TRANSITION_IGNORE_FOR_NTP_TILES) != 0)
441 sync_data.set_navigation_ignore_for_ntp_tiles(true);
442
438 sync_data.set_unique_id(unique_id_); 443 sync_data.set_unique_id(unique_id_);
439 sync_data.set_timestamp_msec(syncer::TimeToProtoTime(timestamp_)); 444 sync_data.set_timestamp_msec(syncer::TimeToProtoTime(timestamp_));
440 // The full-resolution timestamp works as a global ID. 445 // The full-resolution timestamp works as a global ID.
441 sync_data.set_global_id(timestamp_.ToInternalValue()); 446 sync_data.set_global_id(timestamp_.ToInternalValue());
442 447
443 sync_data.set_search_terms(base::UTF16ToUTF8(search_terms_)); 448 sync_data.set_search_terms(base::UTF16ToUTF8(search_terms_));
444 449
445 sync_data.set_http_status_code(http_status_code_); 450 sync_data.set_http_status_code(http_status_code_);
446 451
447 if (favicon_url_.is_valid()) 452 if (favicon_url_.is_valid())
(...skipping 28 matching lines...) Expand all
476 redirect_chain_[last_entry].spec()); 481 redirect_chain_[last_entry].spec());
477 } 482 }
478 } 483 }
479 484
480 sync_data.set_is_restored(is_restored_); 485 sync_data.set_is_restored(is_restored_);
481 486
482 return sync_data; 487 return sync_data;
483 } 488 }
484 489
485 } // namespace sessions 490 } // namespace sessions
OLDNEW
« no previous file with comments | « components/history/core/browser/history_types.h ('k') | components/sessions/core/serialized_navigation_entry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698