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/chromeos/login/registration_screen.h" | 5 #include "chrome/browser/chromeos/login/registration_screen.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 10 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 if (g_browser_process) { | 131 if (g_browser_process) { |
132 const std::string locale = g_browser_process->GetApplicationLocale(); | 132 const std::string locale = g_browser_process->GetApplicationLocale(); |
133 input_method::InputMethodManager* manager = | 133 input_method::InputMethodManager* manager = |
134 input_method::InputMethodManager::GetInstance(); | 134 input_method::InputMethodManager::GetInstance(); |
135 manager->EnableLayouts(locale, ""); | 135 manager->EnableLayouts(locale, ""); |
136 } | 136 } |
137 delegate()->GetObserver()->OnExit(code); | 137 delegate()->GetObserver()->OnExit(code); |
138 } | 138 } |
139 | 139 |
140 // static | 140 // static |
141 net::URLRequestJob* RegistrationScreen::Factory(net::URLRequest* request, | 141 net::URLRequestJob* RegistrationScreen::Factory( |
142 const std::string& scheme) { | 142 net::URLRequest* request, |
| 143 net::NetworkDelegate* network_delegate, |
| 144 const std::string& scheme) { |
143 VLOG(1) << "Handling url: " << request->url().spec().c_str(); | 145 VLOG(1) << "Handling url: " << request->url().spec().c_str(); |
144 return new net::URLRequestAboutJob(request); | 146 return new net::URLRequestAboutJob(request, network_delegate); |
145 } | 147 } |
146 | 148 |
147 } // namespace chromeos | 149 } // namespace chromeos |
OLD | NEW |