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

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

Issue 23075012: Update NetworkStateNotifier to use message_center. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update string ids, handle empty name 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[];
22 ASH_EXPORT extern const char kNetworkActivateNotificationId[];
23
21 // Requests a network connection and handles any errors and notifications. 24 // Requests a network connection and handles any errors and notifications.
22 // |owning_window| is used to parent any UI on failure (e.g. for certificate 25 // |owning_window| is used to parent any UI on failure (e.g. for certificate
23 // enrollment). If NULL, the default window will be used. 26 // enrollment). If NULL, the default window will be used.
24 ASH_EXPORT void ConnectToNetwork(const std::string& service_path, 27 ASH_EXPORT void ConnectToNetwork(const std::string& service_path,
25 gfx::NativeWindow owning_window); 28 gfx::NativeWindow owning_window);
26 29
27 // Requests network activation and handles any errors and notifications. 30 // Requests network activation and handles any errors and notifications.
28 ASH_EXPORT void ActivateCellular(const std::string& service_path); 31 ASH_EXPORT void ActivateCellular(const std::string& service_path);
29 32
30 // Determines whether or not a network requires a connection to activate or 33 // Determines whether or not a network requires a connection to activate or
(...skipping 16 matching lines...) Expand all
47 ASH_EXPORT base::string16 ErrorString(const std::string& error); 50 ASH_EXPORT base::string16 ErrorString(const std::string& error);
48 51
49 // Shows the settings for the network specified by |service_path|. If empty, 52 // Shows the settings for the network specified by |service_path|. If empty,
50 // or no matching network exists, shows the general internet settings page. 53 // or no matching network exists, shows the general internet settings page.
51 ASH_EXPORT void ShowNetworkSettings(const std::string& service_path); 54 ASH_EXPORT void ShowNetworkSettings(const std::string& service_path);
52 55
53 } // network_connect 56 } // network_connect
54 } // ash 57 } // ash
55 58
56 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H 59 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698