chrome/browser/chromeos/options/network_connect.h - Issue 16512003: Configure networks requiring a certificate.

Side by Side Diff: chrome/browser/chromeos/options/network_connect.h

Issue 16512003: Configure networks requiring a certificate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add localized Auth error messages Created 7 years, 6 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

« ash/system/chromeos/network/network_state_notifier.cc ('K') | « chrome/browser/chromeos/options/network_config_view.cc ('k') | chrome/browser/chromeos/options/network_connect.cc » ('j') | chrome/browser/chromeos/options/network_connect.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONNECT_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONNECT_H_

6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONNECT_H_	6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONNECT_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow	10 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow

(...skipping 18 matching lines...) Expand all Loading...
29	29

30 // Attempts to connect to the network specified by \|service_path\|.	30 // Attempts to connect to the network specified by \|service_path\|.

31 // Returns one of the following results:	31 // Returns one of the following results:

32 // NETWORK_NOT_FOUND if the network does not exist.	32 // NETWORK_NOT_FOUND if the network does not exist.

33 // CONNECT_NOT_STARTED if no connection attempt was started, e.g. because the	33 // CONNECT_NOT_STARTED if no connection attempt was started, e.g. because the

34 // network is already connected, connecting, or activating.	34 // network is already connected, connecting, or activating.

35 // CONNECT_STARTED if a connection attempt was started.	35 // CONNECT_STARTED if a connection attempt was started.

36 ConnectResult ConnectToNetwork(const std::string& service_path,	36 ConnectResult ConnectToNetwork(const std::string& service_path,

37 gfx::NativeWindow parent_window);	37 gfx::NativeWindow parent_window);

38	38

	39 // Handle network configuration which might do any of the following:

	40 // * Configure and connect to a network with an existing unconfigured cert.
	pneubeck (no reviews) 2013/06/06 20:41:20 What is an unconfigured cert? Do you mean that the What is an unconfigured cert? Do you mean that the network is not configured with a cert yet? Maybe: "Configure the network with a matching certificate, if required and existent, and connect to it." stevenjb 2013/06/07 03:44:58 Done. Show quoted text On 2013/06/06 20:41:20, pneubeck wrote: > What is an unconfigured cert? Do you mean that the network is not configured > with a cert yet? > Maybe: > "Configure the network with a matching certificate, if required and existent, > and connect to it." Done.
	41 // * Show the enrollment dialog for a network.
	pneubeck (no reviews) 2013/06/06 20:41:20 in all cases it's /the/ network (service_path) in all cases it's /the/ network (service_path) stevenjb 2013/06/07 03:44:58 Done Show quoted text On 2013/06/06 20:41:20, pneubeck wrote: > in all cases it's /the/ network (service_path) Done
	42 // * Show the configuration dialog for a network.

	43 // * Show the activation dialog for a network.

	44 // * Show the settings UI for a network.

	45 void ConfigureNetwork(const std::string& service_path,
	pneubeck (no reviews) 2013/06/06 20:41:20 The function name should also indicate that it mig The function name should also indicate that it might connect, e.g. ConfigureAndConnectNetwork(...) stevenjb 2013/06/07 03:44:58 Renamed HandleUnconfiguredNetwork Show quoted text On 2013/06/06 20:41:20, pneubeck wrote: > The function name should also indicate that it might connect, e.g. > ConfigureAndConnectNetwork(...) Renamed HandleUnconfiguredNetwork
	46 gfx::NativeWindow parent_window);

	47

39 } // namespace network_connect	48 } // namespace network_connect

40 } // namespace chromeos	49 } // namespace chromeos

41	50

42 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONNECT_H_	51 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONNECT_H_

OLD	NEW