OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/settings_contents_view.h" | 5 #include "chrome/browser/chromeos/settings_contents_view.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 int prev_index, | 265 int prev_index, |
266 int new_index); | 266 int new_index); |
267 | 267 |
268 // PasswordDialogDelegate implementation. | 268 // PasswordDialogDelegate implementation. |
269 virtual bool OnPasswordDialogCancel(); | 269 virtual bool OnPasswordDialogCancel(); |
270 virtual bool OnPasswordDialogAccept(const std::string& ssid, | 270 virtual bool OnPasswordDialogAccept(const std::string& ssid, |
271 const string16& password); | 271 const string16& password); |
272 | 272 |
273 // CrosNetworkLibrary::Observer implementation. | 273 // CrosNetworkLibrary::Observer implementation. |
274 virtual void NetworkChanged(CrosNetworkLibrary* obj); | 274 virtual void NetworkChanged(CrosNetworkLibrary* obj); |
| 275 virtual void NetworkTraffic(CrosNetworkLibrary* obj, |
| 276 int traffic_type) {} |
275 | 277 |
276 protected: | 278 protected: |
277 // SettingsContentsSection overrides: | 279 // SettingsContentsSection overrides: |
278 virtual void InitContents(GridLayout* layout); | 280 virtual void InitContents(GridLayout* layout); |
279 | 281 |
280 private: | 282 private: |
281 // The Combobox model for the list of wifi networks | 283 // The Combobox model for the list of wifi networks |
282 class WifiNetworkComboModel : public ComboboxModel { | 284 class WifiNetworkComboModel : public ComboboxModel { |
283 public: | 285 public: |
284 WifiNetworkComboModel() { | 286 WifiNetworkComboModel() { |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
598 layout->StartRow(0, single_column_view_set_id); | 600 layout->StartRow(0, single_column_view_set_id); |
599 layout->AddView(new DateTimeSection(profile())); | 601 layout->AddView(new DateTimeSection(profile())); |
600 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 602 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
601 layout->StartRow(0, single_column_view_set_id); | 603 layout->StartRow(0, single_column_view_set_id); |
602 layout->AddView(new NetworkSection(profile())); | 604 layout->AddView(new NetworkSection(profile())); |
603 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 605 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
604 layout->StartRow(0, single_column_view_set_id); | 606 layout->StartRow(0, single_column_view_set_id); |
605 layout->AddView(new TouchpadSection(profile())); | 607 layout->AddView(new TouchpadSection(profile())); |
606 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 608 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
607 } | 609 } |
OLD | NEW |