OLD | NEW |
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 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 web_prefs.enable_scroll_animator = false; | 485 web_prefs.enable_scroll_animator = false; |
486 | 486 |
487 // The user stylesheet watcher may not exist in a testing profile. | 487 // The user stylesheet watcher may not exist in a testing profile. |
488 if (profile->GetUserStyleSheetWatcher()) { | 488 if (profile->GetUserStyleSheetWatcher()) { |
489 web_prefs.user_style_sheet_enabled = true; | 489 web_prefs.user_style_sheet_enabled = true; |
490 web_prefs.user_style_sheet_location = | 490 web_prefs.user_style_sheet_location = |
491 profile->GetUserStyleSheetWatcher()->user_style_sheet(); | 491 profile->GetUserStyleSheetWatcher()->user_style_sheet(); |
492 } else { | 492 } else { |
493 web_prefs.user_style_sheet_enabled = false; | 493 web_prefs.user_style_sheet_enabled = false; |
494 } | 494 } |
| 495 |
| 496 web_prefs.visual_word_movement_enabled = |
| 497 command_line.HasSwitch(switches::kEnableVisualWordMovement); |
495 } | 498 } |
496 | 499 |
497 { // Certain GPU features might have been blacklisted. | 500 { // Certain GPU features might have been blacklisted. |
498 GpuDataManager* gpu_data_manager = GpuDataManager::GetInstance(); | 501 GpuDataManager* gpu_data_manager = GpuDataManager::GetInstance(); |
499 DCHECK(gpu_data_manager); | 502 DCHECK(gpu_data_manager); |
500 uint32 blacklist_flags = gpu_data_manager->GetGpuFeatureFlags().flags(); | 503 uint32 blacklist_flags = gpu_data_manager->GetGpuFeatureFlags().flags(); |
501 if (blacklist_flags & GpuFeatureFlags::kGpuFeatureAcceleratedCompositing) | 504 if (blacklist_flags & GpuFeatureFlags::kGpuFeatureAcceleratedCompositing) |
502 web_prefs.accelerated_compositing_enabled = false; | 505 web_prefs.accelerated_compositing_enabled = false; |
503 if (blacklist_flags & GpuFeatureFlags::kGpuFeatureWebgl) | 506 if (blacklist_flags & GpuFeatureFlags::kGpuFeatureWebgl) |
504 web_prefs.experimental_webgl_enabled = false; | 507 web_prefs.experimental_webgl_enabled = false; |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 DictionaryValue* inspector_settings = update.Get(); | 548 DictionaryValue* inspector_settings = update.Get(); |
546 inspector_settings->SetWithoutPathExpansion(key, | 549 inspector_settings->SetWithoutPathExpansion(key, |
547 Value::CreateStringValue(value)); | 550 Value::CreateStringValue(value)); |
548 } | 551 } |
549 | 552 |
550 void RenderViewHostDelegateHelper::ClearInspectorSettings( | 553 void RenderViewHostDelegateHelper::ClearInspectorSettings( |
551 content::BrowserContext* browser_context) { | 554 content::BrowserContext* browser_context) { |
552 Profile::FromBrowserContext(browser_context)->GetPrefs()-> | 555 Profile::FromBrowserContext(browser_context)->GetPrefs()-> |
553 ClearPref(prefs::kWebKitInspectorSettings); | 556 ClearPref(prefs::kWebKitInspectorSettings); |
554 } | 557 } |
OLD | NEW |