| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/webui/chromeos/login/base_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" |
| 6 | 6 |
| 7 #include "base/values.h" | 7 #include "base/values.h" |
| 8 #include "chrome/browser/chromeos/login/base_login_display_host.h" | 8 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
| 9 #include "content/public/browser/web_ui.h" | 9 #include "content/public/browser/web_ui.h" |
| 10 #include "ui/base/l10n/l10n_util.h" | 10 #include "ui/base/l10n/l10n_util.h" |
| 11 | 11 |
| 12 namespace chromeos { | 12 namespace chromeos { |
| 13 | 13 |
| 14 LocalizedValuesBuilder::LocalizedValuesBuilder(base::DictionaryValue* dict) | 14 LocalizedValuesBuilder::LocalizedValuesBuilder(base::DictionaryValue* dict) |
| 15 : dict_(dict) { | 15 : dict_(dict) { |
| 16 } | 16 } |
| 17 | 17 |
| 18 void LocalizedValuesBuilder::Add(const std::string& key, int message_id) { | 18 void LocalizedValuesBuilder::Add(const std::string& key, int message_id) { |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 if (!web_ui()) | 105 if (!web_ui()) |
| 106 return; | 106 return; |
| 107 DictionaryValue screen_params; | 107 DictionaryValue screen_params; |
| 108 screen_params.SetString("id", screen_name); | 108 screen_params.SetString("id", screen_name); |
| 109 if (data) | 109 if (data) |
| 110 screen_params.SetWithoutPathExpansion("data", data->DeepCopy()); | 110 screen_params.SetWithoutPathExpansion("data", data->DeepCopy()); |
| 111 web_ui()->CallJavascriptFunction("cr.ui.Oobe.showScreen", screen_params); | 111 web_ui()->CallJavascriptFunction("cr.ui.Oobe.showScreen", screen_params); |
| 112 } | 112 } |
| 113 | 113 |
| 114 gfx::NativeWindow BaseScreenHandler::GetNativeWindow() { | 114 gfx::NativeWindow BaseScreenHandler::GetNativeWindow() { |
| 115 return BaseLoginDisplayHost::default_host()->GetNativeWindow(); | 115 return LoginDisplayHostImpl::default_host()->GetNativeWindow(); |
| 116 } | 116 } |
| 117 | 117 |
| 118 } // namespace chromeos | 118 } // namespace chromeos |
| OLD | NEW |