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

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

Issue 1860743002: Add a flag to change when android's progress bar completes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add flag to include same origin iframes Created 4 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
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 #include <memory> 9 #include <memory>
10 10
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1120 settings->setViewportMetaZeroValuesQuirk( 1120 settings->setViewportMetaZeroValuesQuirk(
1121 prefs.viewport_meta_zero_values_quirk); 1121 prefs.viewport_meta_zero_values_quirk);
1122 settings->setClobberUserAgentInitialScaleQuirk( 1122 settings->setClobberUserAgentInitialScaleQuirk(
1123 prefs.clobber_user_agent_initial_scale_quirk); 1123 prefs.clobber_user_agent_initial_scale_quirk);
1124 settings->setIgnoreMainFrameOverflowHiddenQuirk( 1124 settings->setIgnoreMainFrameOverflowHiddenQuirk(
1125 prefs.ignore_main_frame_overflow_hidden_quirk); 1125 prefs.ignore_main_frame_overflow_hidden_quirk);
1126 settings->setReportScreenSizeInPhysicalPixelsQuirk( 1126 settings->setReportScreenSizeInPhysicalPixelsQuirk(
1127 prefs.report_screen_size_in_physical_pixels_quirk); 1127 prefs.report_screen_size_in_physical_pixels_quirk);
1128 settings->setShouldReuseGlobalForUnownedMainFrame( 1128 settings->setShouldReuseGlobalForUnownedMainFrame(
1129 prefs.resue_global_for_unowned_main_frame); 1129 prefs.resue_global_for_unowned_main_frame);
1130 settings->setProgressBarCompletion(
1131 static_cast<WebSettings::ProgressBarCompletion>(
1132 prefs.progress_bar_completion));
1130 settings->setPreferHiddenVolumeControls(true); 1133 settings->setPreferHiddenVolumeControls(true);
1131 settings->setShrinksViewportContentToFit(true); 1134 settings->setShrinksViewportContentToFit(true);
1132 #endif 1135 #endif
1133 1136
1134 settings->setAutoplayExperimentMode( 1137 settings->setAutoplayExperimentMode(
1135 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode)); 1138 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode));
1136 1139
1137 settings->setViewportEnabled(prefs.viewport_enabled); 1140 settings->setViewportEnabled(prefs.viewport_enabled);
1138 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled); 1141 settings->setViewportMetaEnabled(prefs.viewport_meta_enabled);
1139 settings->setViewportStyle( 1142 settings->setViewportStyle(
(...skipping 2251 matching lines...) Expand 10 before | Expand all | Expand 10 after
3391 return render_frame->focused_pepper_plugin(); 3394 return render_frame->focused_pepper_plugin();
3392 } 3395 }
3393 frame = frame->traverseNext(false); 3396 frame = frame->traverseNext(false);
3394 } 3397 }
3395 3398
3396 return nullptr; 3399 return nullptr;
3397 } 3400 }
3398 #endif 3401 #endif
3399 3402
3400 } // namespace content 3403 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698