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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/network_dropdown_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/network_dropdown_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
6 6
7 #include "base/bind.h"
8 #include "base/bind_helpers.h"
7 #include "chrome/browser/chromeos/login/webui_login_display.h" 9 #include "chrome/browser/chromeos/login/webui_login_display.h"
8 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h" 10 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
9 #include "content/browser/webui/web_ui.h" 11 #include "content/browser/webui/web_ui.h"
10 #include "grit/generated_resources.h" 12 #include "grit/generated_resources.h"
11 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
12 14
13 namespace { 15 namespace {
14 16
15 // JS API callbacks names. 17 // JS API callbacks names.
16 const char kJsApiNetworkItemChosen[] = "networkItemChosen"; 18 const char kJsApiNetworkItemChosen[] = "networkItemChosen";
(...skipping 15 matching lines...) Expand all
32 base::DictionaryValue* localized_strings) { 34 base::DictionaryValue* localized_strings) {
33 localized_strings->SetString("selectNetwork", 35 localized_strings->SetString("selectNetwork",
34 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT)); 36 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT));
35 } 37 }
36 38
37 void NetworkDropdownHandler::Initialize() { 39 void NetworkDropdownHandler::Initialize() {
38 } 40 }
39 41
40 void NetworkDropdownHandler::RegisterMessages() { 42 void NetworkDropdownHandler::RegisterMessages() {
41 web_ui_->RegisterMessageCallback(kJsApiNetworkItemChosen, 43 web_ui_->RegisterMessageCallback(kJsApiNetworkItemChosen,
42 NewCallback(this, &NetworkDropdownHandler::HandleNetworkItemChosen)); 44 base::Bind(&NetworkDropdownHandler::HandleNetworkItemChosen,
45 base::Unretained(this)));
43 web_ui_->RegisterMessageCallback(kJsApiNetworkDropdownShow, 46 web_ui_->RegisterMessageCallback(kJsApiNetworkDropdownShow,
44 NewCallback(this, &NetworkDropdownHandler::HandleNetworkDropdownShow)); 47 base::Bind(&NetworkDropdownHandler::HandleNetworkDropdownShow,
48 base::Unretained(this)));
45 web_ui_->RegisterMessageCallback(kJsApiNetworkDropdownHide, 49 web_ui_->RegisterMessageCallback(kJsApiNetworkDropdownHide,
46 NewCallback(this, &NetworkDropdownHandler::HandleNetworkDropdownHide)); 50 base::Bind(&NetworkDropdownHandler::HandleNetworkDropdownHide,
51 base::Unretained(this)));
47 web_ui_->RegisterMessageCallback(kJsApiNetworkDropdownRefresh, 52 web_ui_->RegisterMessageCallback(kJsApiNetworkDropdownRefresh,
48 NewCallback(this, &NetworkDropdownHandler::HandleNetworkDropdownRefresh)); 53 base::Bind(&NetworkDropdownHandler::HandleNetworkDropdownRefresh,
54 base::Unretained(this)));
49 } 55 }
50 56
51 void NetworkDropdownHandler::HandleNetworkItemChosen( 57 void NetworkDropdownHandler::HandleNetworkItemChosen(
52 const base::ListValue* args) { 58 const base::ListValue* args) {
53 DCHECK(args->GetSize() == 1); 59 DCHECK(args->GetSize() == 1);
54 double id; 60 double id;
55 if (!args->GetDouble(0, &id)) 61 if (!args->GetDouble(0, &id))
56 NOTREACHED(); 62 NOTREACHED();
57 DCHECK(dropdown_.get()); 63 DCHECK(dropdown_.get());
58 dropdown_->OnItemChosen(static_cast<int>(id)); 64 dropdown_->OnItemChosen(static_cast<int>(id));
(...skipping 19 matching lines...) Expand all
78 void NetworkDropdownHandler::HandleNetworkDropdownRefresh( 84 void NetworkDropdownHandler::HandleNetworkDropdownRefresh(
79 const base::ListValue* args) { 85 const base::ListValue* args) {
80 DCHECK(args->GetSize() == 0); 86 DCHECK(args->GetSize() == 0);
81 // Since language change is async, 87 // Since language change is async,
82 // we may in theory be on another screen during this call. 88 // we may in theory be on another screen during this call.
83 if (dropdown_.get()) 89 if (dropdown_.get())
84 dropdown_->Refresh(); 90 dropdown_->Refresh();
85 } 91 }
86 92
87 } // namespace chromeos 93 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698