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

Side by Side Diff: ash/system/chromeos/network/network_connect.h

Issue 22867045: Differentiate between 'connect-failed' and 'bad-passphrase' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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
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 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow 12 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow
13 13
14 namespace base { 14 namespace base {
15 class DictionaryValue; 15 class DictionaryValue;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 namespace network_connect { 19 namespace network_connect {
20 20
21 ASH_EXPORT extern const char kNetworkConnectNotificationId[]; 21 ASH_EXPORT extern const char kNetworkConnectNotificationId[];
22 ASH_EXPORT extern const char kNetworkActivateNotificationId[]; 22 ASH_EXPORT extern const char kNetworkActivateNotificationId[];
23 23
24 ASH_EXPORT extern const char kErrorActivateFailed[];
25
24 // Requests a network connection and handles any errors and notifications. 26 // Requests a network connection and handles any errors and notifications.
25 // |owning_window| is used to parent any UI on failure (e.g. for certificate 27 // |owning_window| is used to parent any UI on failure (e.g. for certificate
26 // enrollment). If NULL, the default window will be used. 28 // enrollment). If NULL, the default window will be used.
27 ASH_EXPORT void ConnectToNetwork(const std::string& service_path, 29 ASH_EXPORT void ConnectToNetwork(const std::string& service_path,
28 gfx::NativeWindow owning_window); 30 gfx::NativeWindow owning_window);
29 31
30 // Enables or disables a network technology. If |technology| refers to cellular 32 // Enables or disables a network technology. If |technology| refers to cellular
31 // and the device cannot be enabled due to a SIM lock, this function will 33 // and the device cannot be enabled due to a SIM lock, this function will
32 // launch the SIM unlock dialog. 34 // launch the SIM unlock dialog.
33 ASH_EXPORT void SetTechnologyEnabled(const std::string& technology, 35 ASH_EXPORT void SetTechnologyEnabled(const std::string& technology,
(...skipping 22 matching lines...) Expand all
56 ASH_EXPORT base::string16 ErrorString(const std::string& error); 58 ASH_EXPORT base::string16 ErrorString(const std::string& error);
57 59
58 // Shows the settings for the network specified by |service_path|. If empty, 60 // Shows the settings for the network specified by |service_path|. If empty,
59 // or no matching network exists, shows the general internet settings page. 61 // or no matching network exists, shows the general internet settings page.
60 ASH_EXPORT void ShowNetworkSettings(const std::string& service_path); 62 ASH_EXPORT void ShowNetworkSettings(const std::string& service_path);
61 63
62 } // network_connect 64 } // network_connect
63 } // ash 65 } // ash
64 66
65 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H 67 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H
OLDNEW
« no previous file with comments | « no previous file | ash/system/chromeos/network/network_connect.cc » ('j') | chromeos/network/network_connection_handler.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698