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

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

Issue 14200033: [cros] Rename BaseLoginDisplayHost to LoginDisplayHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years, 8 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) 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/ui/webui/chromeos/login/network_dropdown.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/chromeos/login/base_login_display_host.h"
12 #include "chrome/browser/chromeos/login/login_display_host.h" 11 #include "chrome/browser/chromeos/login/login_display_host.h"
12 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
13 #include "chrome/browser/chromeos/net/connectivity_state_helper.h" 13 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
14 #include "content/public/browser/web_ui.h" 14 #include "content/public/browser/web_ui.h"
15 #include "ui/base/models/menu_model.h" 15 #include "ui/base/models/menu_model.h"
16 #include "ui/gfx/font.h" 16 #include "ui/gfx/font.h"
17 #include "ui/gfx/image/image.h" 17 #include "ui/gfx/image/image.h"
18 #include "ui/gfx/image/image_skia.h" 18 #include "ui/gfx/image/image_skia.h"
19 #include "ui/webui/web_ui_util.h" 19 #include "ui/webui/web_ui_util.h"
20 20
21 namespace { 21 namespace {
22 22
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 void NetworkDropdown::SetLastNetworkType(ConnectionType last_network_type) { 129 void NetworkDropdown::SetLastNetworkType(ConnectionType last_network_type) {
130 // No longer implemented. TODO(stevenjb): Purge from JS. 130 // No longer implemented. TODO(stevenjb): Purge from JS.
131 } 131 }
132 132
133 void NetworkDropdown::OnItemChosen(int id) { 133 void NetworkDropdown::OnItemChosen(int id) {
134 network_menu_->OnItemChosen(id); 134 network_menu_->OnItemChosen(id);
135 } 135 }
136 136
137 gfx::NativeWindow NetworkDropdown::GetNativeWindow() const { 137 gfx::NativeWindow NetworkDropdown::GetNativeWindow() const {
138 return BaseLoginDisplayHost::default_host()->GetNativeWindow(); 138 return LoginDisplayHostImpl::default_host()->GetNativeWindow();
139 } 139 }
140 140
141 void NetworkDropdown::OpenButtonOptions() { 141 void NetworkDropdown::OpenButtonOptions() {
142 BaseLoginDisplayHost::default_host()->OpenProxySettings(); 142 LoginDisplayHostImpl::default_host()->OpenProxySettings();
143 } 143 }
144 144
145 bool NetworkDropdown::ShouldOpenButtonOptions() const { 145 bool NetworkDropdown::ShouldOpenButtonOptions() const {
146 return !oobe_; 146 return !oobe_;
147 } 147 }
148 148
149 void NetworkDropdown::NetworkManagerChanged() { 149 void NetworkDropdown::NetworkManagerChanged() {
150 Refresh(); 150 Refresh();
151 } 151 }
152 152
(...skipping 19 matching lines...) Expand all
172 web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle", 172 web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
173 title, icon); 173 title, icon);
174 } 174 }
175 175
176 void NetworkDropdown::ForceNetworkScan() { 176 void NetworkDropdown::ForceNetworkScan() {
177 ConnectivityStateHelper::Get()->RequestScan(); 177 ConnectivityStateHelper::Get()->RequestScan();
178 Refresh(); 178 Refresh();
179 } 179 }
180 180
181 } // namespace chromeos 181 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698