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

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

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 years, 9 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 "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2946 matching lines...) Expand 10 before | Expand all | Expand 10 after
2957 document_state->set_was_referred_by_prefetcher(true); 2957 document_state->set_was_referred_by_prefetcher(true);
2958 break; 2958 break;
2959 } 2959 }
2960 } 2960 }
2961 } 2961 }
2962 } 2962 }
2963 } 2963 }
2964 2964
2965 if (content_initiated) { 2965 if (content_initiated) {
2966 const WebURLRequest& request = datasource->request(); 2966 const WebURLRequest& request = datasource->request();
2967 switch (request.cachePolicy()) { 2967 switch (request.getCachePolicy()) {
2968 case WebURLRequest::UseProtocolCachePolicy: // normal load. 2968 case WebURLRequest::UseProtocolCachePolicy: // normal load.
2969 document_state->set_load_type(DocumentState::LINK_LOAD_NORMAL); 2969 document_state->set_load_type(DocumentState::LINK_LOAD_NORMAL);
2970 break; 2970 break;
2971 case WebURLRequest::ReloadIgnoringCacheData: // reload. 2971 case WebURLRequest::ReloadIgnoringCacheData: // reload.
2972 case WebURLRequest::ReloadBypassingCache: // end-to-end reload. 2972 case WebURLRequest::ReloadBypassingCache: // end-to-end reload.
2973 document_state->set_load_type(DocumentState::LINK_LOAD_RELOAD); 2973 document_state->set_load_type(DocumentState::LINK_LOAD_RELOAD);
2974 break; 2974 break;
2975 case WebURLRequest::ReturnCacheDataElseLoad: // allow stale data. 2975 case WebURLRequest::ReturnCacheDataElseLoad: // allow stale data.
2976 document_state->set_load_type(DocumentState::LINK_LOAD_CACHE_STALE_OK); 2976 document_state->set_load_type(DocumentState::LINK_LOAD_CACHE_STALE_OK);
2977 break; 2977 break;
(...skipping 3139 matching lines...) Expand 10 before | Expand all | Expand 10 after
6117 int match_count, 6117 int match_count,
6118 int ordinal, 6118 int ordinal,
6119 const WebRect& selection_rect, 6119 const WebRect& selection_rect,
6120 bool final_status_update) { 6120 bool final_status_update) {
6121 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6121 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6122 selection_rect, ordinal, 6122 selection_rect, ordinal,
6123 final_status_update)); 6123 final_status_update));
6124 } 6124 }
6125 6125
6126 } // namespace content 6126 } // namespace content
OLDNEW
« no previous file with comments | « content/child/web_url_request_util.cc ('k') | third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698