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

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

Issue 607613002: Elim parent_window parameter from network_connect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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
sky 2014/09/25 19:37:18 Hopefully you can remove this now.
stevenjb 2014/09/25 20:14:36 Done.
13 13
14 namespace base { 14 namespace base {
15 class DictionaryValue; 15 class DictionaryValue;
16 } 16 }
17 17
18 namespace chromeos { 18 namespace chromeos {
19 class NetworkTypePattern; 19 class NetworkTypePattern;
20 } 20 }
21 21
22 namespace ash { 22 namespace ash {
23 namespace network_connect { 23 namespace network_connect {
24 24
25 ASH_EXPORT extern const char kNetworkConnectNotificationId[]; 25 ASH_EXPORT extern const char kNetworkConnectNotificationId[];
26 ASH_EXPORT extern const char kNetworkActivateNotificationId[]; 26 ASH_EXPORT extern const char kNetworkActivateNotificationId[];
27 27
28 ASH_EXPORT extern const char kErrorActivateFailed[]; 28 ASH_EXPORT extern const char kErrorActivateFailed[];
29 29
30 // Requests a network connection and handles any errors and notifications. 30 // Requests a network connection and handles any errors and notifications.
31 // |parent_window| is used to parent any UI on failure (e.g. for certificate 31 ASH_EXPORT void ConnectToNetwork(const std::string& service_path);
32 // enrollment). If NULL, the default window will be used.
33 ASH_EXPORT void ConnectToNetwork(const std::string& service_path,
34 gfx::NativeWindow parent_window);
35 32
36 // Enables or disables a network technology. If |technology| refers to cellular 33 // Enables or disables a network technology. If |technology| refers to cellular
37 // and the device cannot be enabled due to a SIM lock, this function will 34 // and the device cannot be enabled due to a SIM lock, this function will
38 // launch the SIM unlock dialog. 35 // launch the SIM unlock dialog.
39 ASH_EXPORT void SetTechnologyEnabled( 36 ASH_EXPORT void SetTechnologyEnabled(
40 const chromeos::NetworkTypePattern& technology, 37 const chromeos::NetworkTypePattern& technology,
41 bool enabled_state); 38 bool enabled_state);
42 39
43 // Requests network activation and handles any errors and notifications. 40 // Requests network activation and handles any errors and notifications.
44 ASH_EXPORT void ActivateCellular(const std::string& service_path); 41 ASH_EXPORT void ActivateCellular(const std::string& service_path);
(...skipping 25 matching lines...) Expand all
70 const std::string& service_path); 67 const std::string& service_path);
71 68
72 // Shows the settings for the network specified by |service_path|. If empty, 69 // Shows the settings for the network specified by |service_path|. If empty,
73 // or no matching network exists, shows the general internet settings page. 70 // or no matching network exists, shows the general internet settings page.
74 ASH_EXPORT void ShowNetworkSettings(const std::string& service_path); 71 ASH_EXPORT void ShowNetworkSettings(const std::string& service_path);
75 72
76 } // network_connect 73 } // network_connect
77 } // ash 74 } // ash
78 75
79 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H 76 #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') | ash/system/tray/system_tray_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698