summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-30 14:19:34 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-30 14:19:34 +0000
commitcc5bccd9d8a11965dd899ecf613361223413aed3 (patch)
tree13c7695c768c93d6c8c1bdf7996793c66d587c45
parent81c937a4a23786cd944deebff39a00731ebbd772 (diff)
downloadchromium_src-cc5bccd9d8a11965dd899ecf613361223413aed3.zip
chromium_src-cc5bccd9d8a11965dd899ecf613361223413aed3.tar.gz
chromium_src-cc5bccd9d8a11965dd899ecf613361223413aed3.tar.bz2
Fix private use of web_ui_, due to merge conflict.
TBR=ivankr@chromium.org Review URL: http://codereview.chromium.org/9034034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116048 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index e1ea228..ab985fb 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -548,8 +548,8 @@ void SigninScreenHandler::LoadAuthExtension(bool force, bool silent_load) {
void SigninScreenHandler::UpdateAuthExtension() {
DictionaryValue params;
UpdateAuthParamsFromSettings(&params, CrosSettings::Get());
- web_ui_->CallJavascriptFunction("login.GaiaSigninScreen.updateAuthExtension",
- params);
+ web_ui()->CallJavascriptFunction("login.GaiaSigninScreen.updateAuthExtension",
+ params);
}
void SigninScreenHandler::ShowSigninScreenForCreds(