OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/chromeos/login/account_screen.h" | 5 #include "chrome/browser/chromeos/login/account_screen.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 10 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 CloseScreen(ScreenObserver::CONNECTION_FAILED); | 119 CloseScreen(ScreenObserver::CONNECTION_FAILED); |
120 } | 120 } |
121 } | 121 } |
122 | 122 |
123 void AccountScreen::NavigationStateChanged(const TabContents* source, | 123 void AccountScreen::NavigationStateChanged(const TabContents* source, |
124 unsigned changed_flags) { | 124 unsigned changed_flags) { |
125 if (source->render_view_host()) { | 125 if (source->render_view_host()) { |
126 source->render_view_host()->InsertCSSInWebFrame( | 126 source->render_view_host()->InsertCSSInWebFrame( |
127 L"", kCreateAccountCSS, ""); | 127 L"", kCreateAccountCSS, ""); |
128 source->render_view_host()->ExecuteJavascriptInWebFrame( | 128 source->render_view_host()->ExecuteJavascriptInWebFrame( |
129 L"", ASCIIToWide(kCreateAccountJS)); | 129 string16(), ASCIIToUTF16(kCreateAccountJS)); |
130 } | 130 } |
131 } | 131 } |
132 | 132 |
133 void AccountScreen::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { | 133 void AccountScreen::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { |
134 views::Widget* widget = view()->GetWidget(); | 134 views::Widget* widget = view()->GetWidget(); |
135 if (widget && event.os_event && !event.skip_in_browser) | 135 if (widget && event.os_event && !event.skip_in_browser) |
136 static_cast<views::WidgetGtk*>(widget)->HandleKeyboardEvent(event.os_event); | 136 static_cast<views::WidgetGtk*>(widget)->HandleKeyboardEvent(event.os_event); |
137 } | 137 } |
138 | 138 |
139 /////////////////////////////////////////////////////////////////////////////// | 139 /////////////////////////////////////////////////////////////////////////////// |
(...skipping 29 matching lines...) Expand all Loading... |
169 // password. | 169 // password. |
170 if (g_browser_process) { | 170 if (g_browser_process) { |
171 const std::string locale = g_browser_process->GetApplicationLocale(); | 171 const std::string locale = g_browser_process->GetApplicationLocale(); |
172 input_method::EnableInputMethods( | 172 input_method::EnableInputMethods( |
173 locale, input_method::kKeyboardLayoutsOnly, ""); | 173 locale, input_method::kKeyboardLayoutsOnly, ""); |
174 } | 174 } |
175 delegate()->GetObserver(this)->OnExit(code); | 175 delegate()->GetObserver(this)->OnExit(code); |
176 } | 176 } |
177 | 177 |
178 } // namespace chromeos | 178 } // namespace chromeos |
OLD | NEW |