OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 // RegistrationScreen, TabContentsDelegate implementation: | 120 // RegistrationScreen, TabContentsDelegate implementation: |
121 | 121 |
122 // TODO(adriansc): Remove this method once refactoring changed all call sites. | 122 // TODO(adriansc): Remove this method once refactoring changed all call sites. |
123 TabContents* RegistrationScreen::OpenURLFromTab( | 123 TabContents* RegistrationScreen::OpenURLFromTab( |
124 TabContents* source, | 124 TabContents* source, |
125 const GURL& url, | 125 const GURL& url, |
126 const GURL& referrer, | 126 const GURL& referrer, |
127 WindowOpenDisposition disposition, | 127 WindowOpenDisposition disposition, |
128 content::PageTransition transition) { | 128 content::PageTransition transition) { |
129 return OpenURLFromTab(source, | 129 return OpenURLFromTab(source, |
130 OpenURLParams(url, referrer, disposition, transition)); | 130 OpenURLParams(url, referrer, disposition, transition, |
| 131 false)); |
131 } | 132 } |
132 | 133 |
133 TabContents* RegistrationScreen::OpenURLFromTab(TabContents* source, | 134 TabContents* RegistrationScreen::OpenURLFromTab(TabContents* source, |
134 const OpenURLParams& params) { | 135 const OpenURLParams& params) { |
135 if (params.url.spec() == kRegistrationSuccessUrl) { | 136 if (params.url.spec() == kRegistrationSuccessUrl) { |
136 source->Stop(); | 137 source->Stop(); |
137 VLOG(1) << "Registration form completed."; | 138 VLOG(1) << "Registration form completed."; |
138 CloseScreen(ScreenObserver::REGISTRATION_SUCCESS); | 139 CloseScreen(ScreenObserver::REGISTRATION_SUCCESS); |
139 } else if (params.url.spec() == kRegistrationSkippedUrl) { | 140 } else if (params.url.spec() == kRegistrationSkippedUrl) { |
140 source->Stop(); | 141 source->Stop(); |
(...skipping 29 matching lines...) Expand all Loading... |
170 } | 171 } |
171 | 172 |
172 // static | 173 // static |
173 net::URLRequestJob* RegistrationScreen::Factory(net::URLRequest* request, | 174 net::URLRequestJob* RegistrationScreen::Factory(net::URLRequest* request, |
174 const std::string& scheme) { | 175 const std::string& scheme) { |
175 VLOG(1) << "Handling url: " << request->url().spec().c_str(); | 176 VLOG(1) << "Handling url: " << request->url().spec().c_str(); |
176 return new net::URLRequestAboutJob(request); | 177 return new net::URLRequestAboutJob(request); |
177 } | 178 } |
178 | 179 |
179 } // namespace chromeos | 180 } // namespace chromeos |
OLD | NEW |