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

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: Fix a bad merge 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 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 settings->setViewportMetaZeroValuesQuirk( 1080 settings->setViewportMetaZeroValuesQuirk(
1081 prefs.viewport_meta_zero_values_quirk); 1081 prefs.viewport_meta_zero_values_quirk);
1082 settings->setClobberUserAgentInitialScaleQuirk( 1082 settings->setClobberUserAgentInitialScaleQuirk(
1083 prefs.clobber_user_agent_initial_scale_quirk); 1083 prefs.clobber_user_agent_initial_scale_quirk);
1084 settings->setIgnoreMainFrameOverflowHiddenQuirk( 1084 settings->setIgnoreMainFrameOverflowHiddenQuirk(
1085 prefs.ignore_main_frame_overflow_hidden_quirk); 1085 prefs.ignore_main_frame_overflow_hidden_quirk);
1086 settings->setReportScreenSizeInPhysicalPixelsQuirk( 1086 settings->setReportScreenSizeInPhysicalPixelsQuirk(
1087 prefs.report_screen_size_in_physical_pixels_quirk); 1087 prefs.report_screen_size_in_physical_pixels_quirk);
1088 settings->setShouldReuseGlobalForUnownedMainFrame( 1088 settings->setShouldReuseGlobalForUnownedMainFrame(
1089 prefs.resue_global_for_unowned_main_frame); 1089 prefs.resue_global_for_unowned_main_frame);
1090 settings->setProgressBarCompletion(
1091 static_cast<WebSettings::ProgressBarCompletion>(
1092 prefs.progress_bar_completion));
1090 settings->setPreferHiddenVolumeControls(true); 1093 settings->setPreferHiddenVolumeControls(true);
1091 settings->setShrinksViewportContentToFit(true); 1094 settings->setShrinksViewportContentToFit(true);
1092 WebRuntimeFeatures::enableAutoplayMutedVideos( 1095 WebRuntimeFeatures::enableAutoplayMutedVideos(
1093 prefs.autoplay_muted_videos_enabled); 1096 prefs.autoplay_muted_videos_enabled);
1094 #endif 1097 #endif
1095 1098
1096 settings->setAutoplayExperimentMode( 1099 settings->setAutoplayExperimentMode(
1097 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode)); 1100 blink::WebString::fromUTF8(prefs.autoplay_experiment_mode));
1098 1101
1099 settings->setViewportEnabled(prefs.viewport_enabled); 1102 settings->setViewportEnabled(prefs.viewport_enabled);
(...skipping 2240 matching lines...) Expand 10 before | Expand all | Expand 10 after
3340 return render_frame->focused_pepper_plugin(); 3343 return render_frame->focused_pepper_plugin();
3341 } 3344 }
3342 frame = frame->traverseNext(false); 3345 frame = frame->traverseNext(false);
3343 } 3346 }
3344 3347
3345 return nullptr; 3348 return nullptr;
3346 } 3349 }
3347 #endif 3350 #endif
3348 3351
3349 } // namespace content 3352 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698