diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 02:15:33 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 02:15:33 +0000 |
| commit | 2f18c44fbb5db9fac1cf5f1d0ce6d303940894d2 (patch) | |
| tree | b4b09644d3bdd0107042021fa1bfbffd8d0631e7 /chrome/browser/resources/options/language_options.js | |
| parent | e2cadec89844f232f4b8887e85cfb72182d49107 (diff) | |
| download | chromium_src-2f18c44fbb5db9fac1cf5f1d0ce6d303940894d2.zip chromium_src-2f18c44fbb5db9fac1cf5f1d0ce6d303940894d2.tar.gz chromium_src-2f18c44fbb5db9fac1cf5f1d0ce6d303940894d2.tar.bz2 | |
first cut at uber page
the subpages are iframes. On the C++ side, the uber WebUI keeps a collection of subpage WebUIs and proxies function calls to them. Calls into JS are directed to the correct iframe by setting a frame name.
The fact it's in an iframe is almost completely transparent to the options page (both from the C++ and JS side); you'll notice there are no changes to any options files.*
*exception: temporary command line changes
BUG=100885
TEST=chrome://uber should have an iframe with chrome://settings in it (fully functional)
Review URL: http://codereview.chromium.org/8889041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/options/language_options.js')
| -rw-r--r-- | chrome/browser/resources/options/language_options.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js index 7503212..452c61c 100644 --- a/chrome/browser/resources/options/language_options.js +++ b/chrome/browser/resources/options/language_options.js @@ -350,7 +350,7 @@ cr.define('options', function() { } else if (languageCode in templateData.uiLanguageCodeSet) { // If the language is supported as UI language, users can click on // the button to change the UI language. - if (cr.commandLine.options['--bwsi']) { + if (cr.commandLine && cr.commandLine.options['--bwsi']) { // In the guest mode for ChromeOS, changing UI language does not make // sense because it does not take effect after browser restart. uiLanguageButton.hidden = true; |