| OLD | NEW |
| 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/wimax_config_view.h" | 5 #include "chrome/browser/chromeos/options/wimax_config_view.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "ui/views/layout/layout_constants.h" | 35 #include "ui/views/layout/layout_constants.h" |
| 36 #include "ui/views/widget/widget.h" | 36 #include "ui/views/widget/widget.h" |
| 37 #include "ui/views/window/dialog_client_view.h" | 37 #include "ui/views/window/dialog_client_view.h" |
| 38 | 38 |
| 39 namespace chromeos { | 39 namespace chromeos { |
| 40 | 40 |
| 41 namespace { | 41 namespace { |
| 42 | 42 |
| 43 void ShillError(const std::string& function, | 43 void ShillError(const std::string& function, |
| 44 const std::string& error_name, | 44 const std::string& error_name, |
| 45 scoped_ptr<base::DictionaryValue> error_data) { | 45 std::unique_ptr<base::DictionaryValue> error_data) { |
| 46 NET_LOG_ERROR("Shill Error from WimaxConfigView: " + error_name, function); | 46 NET_LOG_ERROR("Shill Error from WimaxConfigView: " + error_name, function); |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace | 49 } // namespace |
| 50 | 50 |
| 51 WimaxConfigView::WimaxConfigView(NetworkConfigView* parent, | 51 WimaxConfigView::WimaxConfigView(NetworkConfigView* parent, |
| 52 const std::string& service_path) | 52 const std::string& service_path) |
| 53 : ChildNetworkConfigView(parent, service_path), | 53 : ChildNetworkConfigView(parent, service_path), |
| 54 identity_label_(NULL), | 54 identity_label_(NULL), |
| 55 identity_textfield_(NULL), | 55 identity_textfield_(NULL), |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 } | 372 } |
| 373 } | 373 } |
| 374 | 374 |
| 375 void WimaxConfigView::InitFocus() { | 375 void WimaxConfigView::InitFocus() { |
| 376 views::View* view_to_focus = GetInitiallyFocusedView(); | 376 views::View* view_to_focus = GetInitiallyFocusedView(); |
| 377 if (view_to_focus) | 377 if (view_to_focus) |
| 378 view_to_focus->RequestFocus(); | 378 view_to_focus->RequestFocus(); |
| 379 } | 379 } |
| 380 | 380 |
| 381 } // namespace chromeos | 381 } // namespace chromeos |
| OLD | NEW |