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

Side by Side Diff: chrome/browser/tab_contents/render_view_host_delegate_helper.cc

Issue 6591126: Revert 76631 because it causes fullscreen layout tests to timeout on linux... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « build/features_override.gypi ('k') | chrome/common/chrome_switches.h » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/tab_contents/render_view_host_delegate_helper.h" 5 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 web_prefs.accelerated_plugins_enabled = 298 web_prefs.accelerated_plugins_enabled =
299 command_line.HasSwitch(switches::kEnableAcceleratedPlugins); 299 command_line.HasSwitch(switches::kEnableAcceleratedPlugins);
300 web_prefs.accelerated_video_enabled = 300 web_prefs.accelerated_video_enabled =
301 !command_line.HasSwitch(switches::kDisableAcceleratedVideo); 301 !command_line.HasSwitch(switches::kDisableAcceleratedVideo);
302 web_prefs.memory_info_enabled = 302 web_prefs.memory_info_enabled =
303 command_line.HasSwitch(switches::kEnableMemoryInfo); 303 command_line.HasSwitch(switches::kEnableMemoryInfo);
304 web_prefs.hyperlink_auditing_enabled = 304 web_prefs.hyperlink_auditing_enabled =
305 !command_line.HasSwitch(switches::kNoPings); 305 !command_line.HasSwitch(switches::kNoPings);
306 web_prefs.interactive_form_validation_enabled = 306 web_prefs.interactive_form_validation_enabled =
307 !command_line.HasSwitch(switches::kDisableInteractiveFormValidation); 307 !command_line.HasSwitch(switches::kDisableInteractiveFormValidation);
308 web_prefs.fullscreen_enabled =
309 command_line.HasSwitch(switches::kEnableFullScreen);
310
311 // The user stylesheet watcher may not exist in a testing profile. 308 // The user stylesheet watcher may not exist in a testing profile.
312 if (profile->GetUserStyleSheetWatcher()) { 309 if (profile->GetUserStyleSheetWatcher()) {
313 web_prefs.user_style_sheet_enabled = true; 310 web_prefs.user_style_sheet_enabled = true;
314 web_prefs.user_style_sheet_location = 311 web_prefs.user_style_sheet_location =
315 profile->GetUserStyleSheetWatcher()->user_style_sheet(); 312 profile->GetUserStyleSheetWatcher()->user_style_sheet();
316 } else { 313 } else {
317 web_prefs.user_style_sheet_enabled = false; 314 web_prefs.user_style_sheet_enabled = false;
318 } 315 }
319 } 316 }
320 317
(...skipping 28 matching lines...) Expand all
349 inspector_settings->SetWithoutPathExpansion(key, 346 inspector_settings->SetWithoutPathExpansion(key,
350 Value::CreateStringValue(value)); 347 Value::CreateStringValue(value));
351 } 348 }
352 349
353 void RenderViewHostDelegateHelper::ClearInspectorSettings(Profile* profile) { 350 void RenderViewHostDelegateHelper::ClearInspectorSettings(Profile* profile) {
354 DictionaryValue* inspector_settings = 351 DictionaryValue* inspector_settings =
355 profile->GetPrefs()->GetMutableDictionary( 352 profile->GetPrefs()->GetMutableDictionary(
356 prefs::kWebKitInspectorSettings); 353 prefs::kWebKitInspectorSettings);
357 inspector_settings->Clear(); 354 inspector_settings->Clear();
358 } 355 }
OLDNEW
« no previous file with comments | « build/features_override.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698