diff options
author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 14:01:21 +0000 |
---|---|---|
committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 14:01:21 +0000 |
commit | 6ae3d4909757757f27940369e1bdc67eebd52b87 (patch) | |
tree | b95726d81214d6824646008e53d870d0ee8f2feb /chrome_frame/chrome_frame_automation.h | |
parent | b85e5120573c61b9bdd492fb903b334bf1119d8f (diff) | |
download | chromium_src-6ae3d4909757757f27940369e1bdc67eebd52b87.zip chromium_src-6ae3d4909757757f27940369e1bdc67eebd52b87.tar.gz chromium_src-6ae3d4909757757f27940369e1bdc67eebd52b87.tar.bz2 |
Various changes to make GCF nicer for the non-en-US world:
- Chrome Frame now uses MUI on Vista+ to detect IE's UX language.
- Chrome Frame now tells Chrome (via the --lang command-line option) what the current langauge is.
- Chrome Frame now respects Chrome's "ApplicationLocaleValue" group policy setting.
BUG=56435,59582
TEST=chrome_frame_unittests and chrome_frame_tests updated
Review URL: http://codereview.chromium.org/3757007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.h')
-rw-r--r-- | chrome_frame/chrome_frame_automation.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index 8500ee7..47b03c0 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -109,14 +109,15 @@ class ChromeFrameLaunchParams : // NOLINT ChromeFrameLaunchParams(const GURL& url, const GURL& referrer, const FilePath& profile_path, const std::wstring& profile_name, + const std::wstring& language, const std::wstring& extra_arguments, bool incognito, bool widget_mode, bool route_all_top_level_navigations) : launch_timeout_(kCommandExecutionTimeout), url_(url), referrer_(referrer), profile_path_(profile_path), - profile_name_(profile_name), extra_arguments_(extra_arguments), - version_check_(true), incognito_mode_(incognito), - is_widget_mode_(widget_mode), + profile_name_(profile_name), language_(language), + extra_arguments_(extra_arguments), version_check_(true), + incognito_mode_(incognito), is_widget_mode_(widget_mode), route_all_top_level_navigations_(route_all_top_level_navigations) { } @@ -155,6 +156,10 @@ class ChromeFrameLaunchParams : // NOLINT return profile_name_; } + const std::wstring& language() const { + return language_; + } + const std::wstring& extra_arguments() const { return extra_arguments_; } @@ -190,6 +195,7 @@ class ChromeFrameLaunchParams : // NOLINT GURL referrer_; FilePath profile_path_; std::wstring profile_name_; + std::wstring language_; std::wstring extra_arguments_; bool version_check_; bool incognito_mode_; |