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

Side by Side Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 10827271: Replace views::Event with ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/chromeos/options/network_config_view.h" 5 #include "chrome/browser/chromeos/options/network_config_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 return this; 187 return this;
188 } 188 }
189 189
190 void NetworkConfigView::GetAccessibleState(ui::AccessibleViewState* state) { 190 void NetworkConfigView::GetAccessibleState(ui::AccessibleViewState* state) {
191 state->name = 191 state->name =
192 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS); 192 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS);
193 state->role = ui::AccessibilityTypes::ROLE_DIALOG; 193 state->role = ui::AccessibilityTypes::ROLE_DIALOG;
194 } 194 }
195 195
196 void NetworkConfigView::ButtonPressed(views::Button* sender, 196 void NetworkConfigView::ButtonPressed(views::Button* sender,
197 const views::Event& event) { 197 const ui::Event& event) {
198 if (advanced_button_ && sender == advanced_button_) { 198 if (advanced_button_ && sender == advanced_button_) {
199 advanced_button_->SetVisible(false); 199 advanced_button_->SetVisible(false);
200 ShowAdvancedView(); 200 ShowAdvancedView();
201 } 201 }
202 } 202 }
203 203
204 void NetworkConfigView::ShowAdvancedView() { 204 void NetworkConfigView::ShowAdvancedView() {
205 // Clear out the old widgets and build new ones. 205 // Clear out the old widgets and build new ones.
206 RemoveChildView(child_config_view_); 206 RemoveChildView(child_config_view_);
207 delete child_config_view_; 207 delete child_config_view_;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 image_view_ = new views::ImageView(); 317 image_view_ = new views::ImageView();
318 // Disable |image_view_| so mouse events propagate to the parent. 318 // Disable |image_view_| so mouse events propagate to the parent.
319 image_view_->SetEnabled(false); 319 image_view_->SetEnabled(false);
320 image_view_->SetImage(gray_image_); 320 image_view_->SetImage(gray_image_);
321 image_view_->SetTooltipText( 321 image_view_->SetTooltipText(
322 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY)); 322 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
323 AddChildView(image_view_); 323 AddChildView(image_view_);
324 } 324 }
325 325
326 } // namespace chromeos 326 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | chrome/browser/chromeos/options/vpn_config_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698