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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 874743003: Revert of Remove the use of page id from building the commit params. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | 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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 params.never_visible), 635 params.never_visible),
636 webkit_preferences_(params.web_preferences), 636 webkit_preferences_(params.web_preferences),
637 send_content_state_immediately_(false), 637 send_content_state_immediately_(false),
638 enabled_bindings_(0), 638 enabled_bindings_(0),
639 send_preferred_size_changes_(false), 639 send_preferred_size_changes_(false),
640 navigation_gesture_(NavigationGestureUnknown), 640 navigation_gesture_(NavigationGestureUnknown),
641 opened_by_user_gesture_(true), 641 opened_by_user_gesture_(true),
642 opener_suppressed_(false), 642 opener_suppressed_(false),
643 suppress_dialogs_until_swap_out_(false), 643 suppress_dialogs_until_swap_out_(false),
644 page_id_(-1), 644 page_id_(-1),
645 last_page_id_sent_to_browser_(-1),
645 next_page_id_(params.next_page_id), 646 next_page_id_(params.next_page_id),
646 history_list_offset_(-1), 647 history_list_offset_(-1),
647 history_list_length_(0), 648 history_list_length_(0),
648 frames_in_progress_(0), 649 frames_in_progress_(0),
649 target_url_status_(TARGET_NONE), 650 target_url_status_(TARGET_NONE),
650 uses_temporary_zoom_level_(false), 651 uses_temporary_zoom_level_(false),
651 #if defined(OS_ANDROID) 652 #if defined(OS_ANDROID)
652 top_controls_constraints_(cc::BOTH), 653 top_controls_constraints_(cc::BOTH),
653 #endif 654 #endif
654 has_scrolled_focused_editable_node_into_rect_(false), 655 has_scrolled_focused_editable_node_into_rect_(false),
(...skipping 3443 matching lines...) Expand 10 before | Expand all | Expand 10 after
4098 std::vector<gfx::Size> sizes; 4099 std::vector<gfx::Size> sizes;
4099 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4100 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4100 if (!url.isEmpty()) 4101 if (!url.isEmpty())
4101 urls.push_back( 4102 urls.push_back(
4102 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4103 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4103 } 4104 }
4104 SendUpdateFaviconURL(urls); 4105 SendUpdateFaviconURL(urls);
4105 } 4106 }
4106 4107
4107 } // namespace content 4108 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698