summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 16:32:36 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 16:32:36 +0000
commit1661a3c0b786300978f644c0b733f491710e32d9 (patch)
tree7c3e2367bf902fcf9939460250bf397920729649 /chrome/browser/tab_contents
parent4a8b67dbf6779eb58f3d4fbd65bcd68b4744f655 (diff)
downloadchromium_src-1661a3c0b786300978f644c0b733f491710e32d9.zip
chromium_src-1661a3c0b786300978f644c0b733f491710e32d9.tar.gz
chromium_src-1661a3c0b786300978f644c0b733f491710e32d9.tar.bz2
[Mac] Add a preference for the tab key cycling between just form fields, or links as well.
XIB change: Add a checkbox bound to FilesOwner.tabsToLinks underneath the translate webpages preference. BUG=31177 TEST=Uncheck Chromium-->Preferences-->Under the Hood-->Pressing Tab... Then press Tab on Google.com and the links don't get focus; it alternates between search field and location bar. Review URL: http://codereview.chromium.org/2082011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc1
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc3
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index a1f7f01..590a500 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -190,6 +190,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
prefs->GetBoolean(prefs::kWebKitShrinksStandaloneImagesToFit);
web_prefs.inspector_settings = WideToUTF8(
prefs->GetString(prefs::kWebKitInspectorSettings));
+ web_prefs.tabs_to_links = prefs->GetBoolean(prefs::kWebkitTabsToLinks);
{ // Command line switches are used for preferences with no user interface.
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 9d1a558..189f00a 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -167,6 +167,7 @@ const wchar_t* kPrefsToObserve[] = {
prefs::kWebKitFixedFontFamily,
prefs::kWebKitDefaultFontSize,
prefs::kWebKitDefaultFixedFontSize,
+ prefs::kWebkitTabsToLinks,
prefs::kDefaultCharset
// kWebKitStandardFontIsSerif needs to be added
// if we let users pick which font to use, serif or sans-serif when
@@ -443,6 +444,8 @@ void TabContents::RegisterUserPrefs(PrefService* prefs) {
pref_defaults.text_areas_are_resizable);
prefs->RegisterBooleanPref(prefs::kWebKitJavaEnabled,
pref_defaults.java_enabled);
+ prefs->RegisterBooleanPref(prefs::kWebkitTabsToLinks,
+ pref_defaults.tabs_to_links);
prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages,
IDS_ACCEPT_LANGUAGES);