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

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

Issue 11571023: Move ash/wm's DialogFrameView to ui/views/window; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reorder DialogDelegate functions; inline Get*Params into WidgetExample::ButtonPressed; etc. Created 8 years 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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 } 179 }
180 180
181 views::View* NetworkConfigView::GetInitiallyFocusedView() { 181 views::View* NetworkConfigView::GetInitiallyFocusedView() {
182 return child_config_view_->GetInitiallyFocusedView(); 182 return child_config_view_->GetInitiallyFocusedView();
183 } 183 }
184 184
185 ui::ModalType NetworkConfigView::GetModalType() const { 185 ui::ModalType NetworkConfigView::GetModalType() const {
186 return ui::MODAL_TYPE_SYSTEM; 186 return ui::MODAL_TYPE_SYSTEM;
187 } 187 }
188 188
189 views::View* NetworkConfigView::GetContentsView() {
190 return this;
191 }
192
193 void NetworkConfigView::GetAccessibleState(ui::AccessibleViewState* state) { 189 void NetworkConfigView::GetAccessibleState(ui::AccessibleViewState* state) {
194 state->name = 190 state->name =
195 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS); 191 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS);
196 state->role = ui::AccessibilityTypes::ROLE_DIALOG; 192 state->role = ui::AccessibilityTypes::ROLE_DIALOG;
197 } 193 }
198 194
199 void NetworkConfigView::ButtonPressed(views::Button* sender, 195 void NetworkConfigView::ButtonPressed(views::Button* sender,
200 const ui::Event& event) { 196 const ui::Event& event) {
201 if (advanced_button_ && sender == advanced_button_) { 197 if (advanced_button_ && sender == advanced_button_) {
202 advanced_button_->SetVisible(false); 198 advanced_button_->SetVisible(false);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 image_view_ = new views::ImageView(); 316 image_view_ = new views::ImageView();
321 // Disable |image_view_| so mouse events propagate to the parent. 317 // Disable |image_view_| so mouse events propagate to the parent.
322 image_view_->SetEnabled(false); 318 image_view_->SetEnabled(false);
323 image_view_->SetImage(gray_image_); 319 image_view_->SetImage(gray_image_);
324 image_view_->SetTooltipText( 320 image_view_->SetTooltipText(
325 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY)); 321 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
326 AddChildView(image_view_); 322 AddChildView(image_view_);
327 } 323 }
328 324
329 } // namespace chromeos 325 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | chrome/browser/chromeos/ui/idle_logout_dialog_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698