Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 8113018: [web-ui] Migrate RegisterMessageCallback usage to base::bind(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/bind.h"
8 #include "base/bind_helpers.h"
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/hash_tables.h" 10 #include "base/hash_tables.h"
9 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
10 #include "base/task.h" 12 #include "base/task.h"
11 #include "base/values.h" 13 #include "base/values.h"
12 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/browser_shutdown.h" 15 #include "chrome/browser/browser_shutdown.h"
14 #include "chrome/browser/io_thread.h" 16 #include "chrome/browser/io_thread.h"
15 #include "chrome/browser/chromeos/cros/cros_library.h" 17 #include "chrome/browser/chromeos/cros/cros_library.h"
16 #include "chrome/browser/chromeos/cros/network_library.h" 18 #include "chrome/browser/chromeos/cros/network_library.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 if (show_on_init_) { 275 if (show_on_init_) {
274 show_on_init_ = false; 276 show_on_init_ = false;
275 Show(oobe_ui_); 277 Show(oobe_ui_);
276 } 278 }
277 } 279 }
278 280
279 void SigninScreenHandler::RegisterMessages() { 281 void SigninScreenHandler::RegisterMessages() {
280 network_state_informer_.reset(new NetworkStateInformer(web_ui_)); 282 network_state_informer_.reset(new NetworkStateInformer(web_ui_));
281 283
282 web_ui_->RegisterMessageCallback("authenticateUser", 284 web_ui_->RegisterMessageCallback("authenticateUser",
283 NewCallback(this, &SigninScreenHandler::HandleAuthenticateUser)); 285 base::Bind(&SigninScreenHandler::HandleAuthenticateUser,
286 base::Unretained(this)));
284 web_ui_->RegisterMessageCallback("completeLogin", 287 web_ui_->RegisterMessageCallback("completeLogin",
285 NewCallback(this, &SigninScreenHandler::HandleCompleteLogin)); 288 base::Bind(&SigninScreenHandler::HandleCompleteLogin,
289 base::Unretained(this)));
286 web_ui_->RegisterMessageCallback("getUsers", 290 web_ui_->RegisterMessageCallback("getUsers",
287 NewCallback(this, &SigninScreenHandler::HandleGetUsers)); 291 base::Bind(&SigninScreenHandler::HandleGetUsers,
292 base::Unretained(this)));
288 web_ui_->RegisterMessageCallback("launchIncognito", 293 web_ui_->RegisterMessageCallback("launchIncognito",
289 NewCallback(this, &SigninScreenHandler::HandleLaunchIncognito)); 294 base::Bind(&SigninScreenHandler::HandleLaunchIncognito,
295 base::Unretained(this)));
290 web_ui_->RegisterMessageCallback("fixCaptivePortal", 296 web_ui_->RegisterMessageCallback("fixCaptivePortal",
291 NewCallback(this, &SigninScreenHandler::HandleFixCaptivePortal)); 297 base::Bind(&SigninScreenHandler::HandleFixCaptivePortal,
298 base::Unretained(this)));
292 web_ui_->RegisterMessageCallback("showAddUser", 299 web_ui_->RegisterMessageCallback("showAddUser",
293 NewCallback(this, &SigninScreenHandler::HandleShowAddUser)); 300 base::Bind(&SigninScreenHandler::HandleShowAddUser,
301 base::Unretained(this)));
294 web_ui_->RegisterMessageCallback("shutdownSystem", 302 web_ui_->RegisterMessageCallback("shutdownSystem",
295 NewCallback(this, &SigninScreenHandler::HandleShutdownSystem)); 303 base::Bind(&SigninScreenHandler::HandleShutdownSystem,
304 base::Unretained(this)));
296 web_ui_->RegisterMessageCallback("removeUser", 305 web_ui_->RegisterMessageCallback("removeUser",
297 NewCallback(this, &SigninScreenHandler::HandleRemoveUser)); 306 base::Bind(&SigninScreenHandler::HandleRemoveUser,
307 base::Unretained(this)));
298 web_ui_->RegisterMessageCallback("toggleEnrollmentScreen", 308 web_ui_->RegisterMessageCallback("toggleEnrollmentScreen",
299 NewCallback(this, &SigninScreenHandler::HandleToggleEnrollmentScreen)); 309 base::Bind(&SigninScreenHandler::HandleToggleEnrollmentScreen,
310 base::Unretained(this)));
300 web_ui_->RegisterMessageCallback("launchHelpApp", 311 web_ui_->RegisterMessageCallback("launchHelpApp",
301 NewCallback(this, &SigninScreenHandler::HandleLaunchHelpApp)); 312 base::Bind(&SigninScreenHandler::HandleLaunchHelpApp,
313 base::Unretained(this)));
302 web_ui_->RegisterMessageCallback("createAccount", 314 web_ui_->RegisterMessageCallback("createAccount",
303 NewCallback(this, &SigninScreenHandler::HandleCreateAccount)); 315 base::Bind(&SigninScreenHandler::HandleCreateAccount,
316 base::Unretained(this)));
304 web_ui_->RegisterMessageCallback("loginWebuiReady", 317 web_ui_->RegisterMessageCallback("loginWebuiReady",
305 NewCallback(this, &SigninScreenHandler::HandleLoginWebuiReady)); 318 base::Bind(&SigninScreenHandler::HandleLoginWebuiReady,
319 base::Unretained(this)));
306 web_ui_->RegisterMessageCallback("loginRequestNetworkState", 320 web_ui_->RegisterMessageCallback("loginRequestNetworkState",
307 NewCallback(this, &SigninScreenHandler::HandleLoginRequestNetworkState)); 321 base::Bind(&SigninScreenHandler::HandleLoginRequestNetworkState,
322 base::Unretained(this)));
308 web_ui_->RegisterMessageCallback("loginAddNetworkStateObserver", 323 web_ui_->RegisterMessageCallback("loginAddNetworkStateObserver",
309 NewCallback(this, 324 base::Bind(&SigninScreenHandler::HandleLoginAddNetworkStateObserver,
310 &SigninScreenHandler::HandleLoginAddNetworkStateObserver)); 325 base::Unretained(this)));
311 web_ui_->RegisterMessageCallback("loginRemoveNetworkStateObserver", 326 web_ui_->RegisterMessageCallback("loginRemoveNetworkStateObserver",
312 NewCallback(this, 327 base::Bind(&SigninScreenHandler::HandleLoginRemoveNetworkStateObserver,
313 &SigninScreenHandler::HandleLoginRemoveNetworkStateObserver)); 328 base::Unretained(this)));
314 } 329 }
315 330
316 void SigninScreenHandler::HandleGetUsers(const base::ListValue* args) { 331 void SigninScreenHandler::HandleGetUsers(const base::ListValue* args) {
317 SendUserList(false); 332 SendUserList(false);
318 } 333 }
319 334
320 void SigninScreenHandler::ClearAndEnablePassword() { 335 void SigninScreenHandler::ClearAndEnablePassword() {
321 web_ui_->CallJavascriptFunction("cr.ui.Oobe.resetSigninUI"); 336 web_ui_->CallJavascriptFunction("cr.ui.Oobe.resetSigninUI");
322 } 337 }
323 338
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 630
616 cookie_remover_ = new BrowsingDataRemover( 631 cookie_remover_ = new BrowsingDataRemover(
617 Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()), 632 Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()),
618 BrowsingDataRemover::EVERYTHING, 633 BrowsingDataRemover::EVERYTHING,
619 base::Time()); 634 base::Time());
620 cookie_remover_->AddObserver(this); 635 cookie_remover_->AddObserver(this);
621 cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA); 636 cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA);
622 } 637 }
623 638
624 } // namespace chromeos 639 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698