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

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

Issue 2689633002: Change the default button of Network Wifi config dialog back to 'Connect'. (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 } 193 }
194 194
195 views::View* NetworkConfigView::CreateExtraView() { 195 views::View* NetworkConfigView::CreateExtraView() {
196 return advanced_button_; 196 return advanced_button_;
197 } 197 }
198 198
199 views::View* NetworkConfigView::GetInitiallyFocusedView() { 199 views::View* NetworkConfigView::GetInitiallyFocusedView() {
200 return child_config_view_->GetInitiallyFocusedView(); 200 return child_config_view_->GetInitiallyFocusedView();
201 } 201 }
202 202
203 int NetworkConfigView::GetDefaultDialogButton() const {
204 return ui::DIALOG_BUTTON_CANCEL;
205 }
206
207 base::string16 NetworkConfigView::GetWindowTitle() const { 203 base::string16 NetworkConfigView::GetWindowTitle() const {
208 DCHECK(!child_config_view_->GetTitle().empty()); 204 DCHECK(!child_config_view_->GetTitle().empty());
209 return child_config_view_->GetTitle(); 205 return child_config_view_->GetTitle();
210 } 206 }
211 207
212 ui::ModalType NetworkConfigView::GetModalType() const { 208 ui::ModalType NetworkConfigView::GetModalType() const {
213 return ui::MODAL_TYPE_SYSTEM; 209 return ui::MODAL_TYPE_SYSTEM;
214 } 210 }
215 211
216 void NetworkConfigView::GetAccessibleNodeData(ui::AXNodeData* node_data) { 212 void NetworkConfigView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 } 333 }
338 334
339 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {} 335 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {}
340 336
341 gfx::Size ControlledSettingIndicatorView::GetPreferredSize() const { 337 gfx::Size ControlledSettingIndicatorView::GetPreferredSize() const {
342 return (managed_ && visible()) ? image_view_->GetPreferredSize() 338 return (managed_ && visible()) ? image_view_->GetPreferredSize()
343 : gfx::Size(); 339 : gfx::Size();
344 } 340 }
345 341
346 } // namespace chromeos 342 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698