chrome/browser/chromeos/options/wifi_config_view.cc - Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos.

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

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix build Created 6 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

« no previous file with comments | « chrome/browser/chromeos/options/vpn_config_view.cc ('k') | chrome/browser/chromeos/options/wimax_config_view.cc » ('j') | no next file with comments »

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/wifi_config_view.h"	5 #include "chrome/browser/chromeos/options/wifi_config_view.h"

6	6

7 #include "ash/system/chromeos/network/network_connect.h"	7 #include "ash/system/chromeos/network/network_connect.h"

8 #include "base/bind.h"	8 #include "base/bind.h"

9 #include "base/strings/string_util.h"	9 #include "base/strings/string_util.h"

10 #include "base/strings/stringprintf.h"	10 #include "base/strings/stringprintf.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "chrome/browser/chromeos/enrollment_dialog_view.h"	12 #include "chrome/browser/chromeos/enrollment_dialog_view.h"

13 #include "chrome/browser/chromeos/net/onc_utils.h"	13 #include "chrome/browser/chromeos/net/onc_utils.h"

14 #include "chrome/browser/chromeos/options/passphrase_textfield.h"	14 #include "chrome/browser/chromeos/options/passphrase_textfield.h"

15 #include "chrome/browser/profiles/profile_manager.h"	15 #include "chrome/browser/profiles/profile_manager.h"

	16 #include "chrome/grit/chromium_strings.h"

	17 #include "chrome/grit/generated_resources.h"

	18 #include "chrome/grit/locale_settings.h"

	19 #include "chrome/grit/theme_resources.h"

16 #include "chromeos/login/login_state.h"	20 #include "chromeos/login/login_state.h"

17 #include "chromeos/network/client_cert_util.h"	21 #include "chromeos/network/client_cert_util.h"

18 #include "chromeos/network/network_configuration_handler.h"	22 #include "chromeos/network/network_configuration_handler.h"

19 #include "chromeos/network/network_event_log.h"	23 #include "chromeos/network/network_event_log.h"

20 #include "chromeos/network/network_handler.h"	24 #include "chromeos/network/network_handler.h"

21 #include "chromeos/network/network_state.h"	25 #include "chromeos/network/network_state.h"

22 #include "chromeos/network/network_state_handler.h"	26 #include "chromeos/network/network_state_handler.h"

23 #include "chromeos/network/network_ui_data.h"	27 #include "chromeos/network/network_ui_data.h"

24 #include "chromeos/network/shill_property_util.h"	28 #include "chromeos/network/shill_property_util.h"

25 #include "components/onc/onc_constants.h"	29 #include "components/onc/onc_constants.h"

26 #include "grit/chromium_strings.h"

27 #include "grit/generated_resources.h"

28 #include "grit/locale_settings.h"

29 #include "grit/theme_resources.h"

30 #include "third_party/cros_system_api/dbus/service_constants.h"	30 #include "third_party/cros_system_api/dbus/service_constants.h"

31 #include "ui/base/l10n/l10n_util.h"	31 #include "ui/base/l10n/l10n_util.h"

32 #include "ui/base/resource/resource_bundle.h"	32 #include "ui/base/resource/resource_bundle.h"

33 #include "ui/events/event.h"	33 #include "ui/events/event.h"

34 #include "ui/views/controls/button/checkbox.h"	34 #include "ui/views/controls/button/checkbox.h"

35 #include "ui/views/controls/button/image_button.h"	35 #include "ui/views/controls/button/image_button.h"

36 #include "ui/views/controls/combobox/combobox.h"	36 #include "ui/views/controls/combobox/combobox.h"

37 #include "ui/views/controls/label.h"	37 #include "ui/views/controls/label.h"

38 #include "ui/views/controls/textfield/textfield.h"	38 #include "ui/views/controls/textfield/textfield.h"

39 #include "ui/views/layout/grid_layout.h"	39 #include "ui/views/layout/grid_layout.h"

(...skipping 1334 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1374 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,	1374 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,

1375 const NetworkState* network,	1375 const NetworkState* network,

1376 const std::string& key) {	1376 const std::string& key) {

1377 std::string onc_tag = network->type() == shill::kTypeEthernet	1377 std::string onc_tag = network->type() == shill::kTypeEthernet

1378 ? ::onc::ethernet::kEAP	1378 ? ::onc::ethernet::kEAP

1379 : ::onc::wifi::kEAP;	1379 : ::onc::wifi::kEAP;

1380 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);	1380 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);

1381 }	1381 }

1382	1382

1383 } // namespace chromeos	1383 } // namespace chromeos

OLD	NEW