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

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

Issue 2869019: Don't generate a certificate browse button or passphrase field if cert path contains SETTINGS: (Closed)
Patch Set: Simplified SETTINGS: parsing. Created 10 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_WIFI_CONFIG_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // SelectFileDialog::Listener implementation. 47 // SelectFileDialog::Listener implementation.
48 virtual void FileSelected(const FilePath& path, int index, void* params); 48 virtual void FileSelected(const FilePath& path, int index, void* params);
49 49
50 // Login to network. 50 // Login to network.
51 virtual bool Login(); 51 virtual bool Login();
52 52
53 // Save network information. 53 // Save network information.
54 virtual bool Save(); 54 virtual bool Save();
55 55
56 // Get the typed in ssid. 56 // Get the typed in ssid.
57 const string16& GetSSID() const; 57 const std::string GetSSID() const;
58 // Get the typed in passphrase. 58 // Get the typed in passphrase.
59 const string16& GetPassphrase() const; 59 const std::string GetPassphrase() const;
60 60
61 // Returns true if the textfields are non-empty and we can login. 61 // Returns true if the textfields are non-empty and we can login.
62 bool can_login() const { return can_login_; } 62 bool can_login() const { return can_login_; }
63 63
64 // Focus the first field in the UI. 64 // Focus the first field in the UI.
65 void FocusFirstField(); 65 void FocusFirstField();
66 66
67 private: 67 private:
68 FRIEND_TEST_ALL_PREFIXES(WifiConfigViewTest, NoChangeSaveTest); 68 FRIEND_TEST_ALL_PREFIXES(WifiConfigViewTest, NoChangeSaveTest);
69 FRIEND_TEST_ALL_PREFIXES(WifiConfigViewTest, ChangeAutoConnectSaveTest); 69 FRIEND_TEST_ALL_PREFIXES(WifiConfigViewTest, ChangeAutoConnectSaveTest);
(...skipping 11 matching lines...) Expand all
81 // Whether or not we can log in. This gets recalculated when textfield 81 // Whether or not we can log in. This gets recalculated when textfield
82 // contents change. 82 // contents change.
83 bool can_login_; 83 bool can_login_;
84 84
85 WifiNetwork wifi_; 85 WifiNetwork wifi_;
86 86
87 views::Textfield* ssid_textfield_; 87 views::Textfield* ssid_textfield_;
88 views::Textfield* identity_textfield_; 88 views::Textfield* identity_textfield_;
89 views::NativeButton* certificate_browse_button_; 89 views::NativeButton* certificate_browse_button_;
90 scoped_refptr<SelectFileDialog> select_file_dialog_; 90 scoped_refptr<SelectFileDialog> select_file_dialog_;
91 FilePath certificate_path_; 91 std::string certificate_path_;
92 views::Textfield* passphrase_textfield_; 92 views::Textfield* passphrase_textfield_;
93 views::ImageButton* passphrase_visible_button_; 93 views::ImageButton* passphrase_visible_button_;
94 views::Checkbox* autoconnect_checkbox_; 94 views::Checkbox* autoconnect_checkbox_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(WifiConfigView); 96 DISALLOW_COPY_AND_ASSIGN(WifiConfigView);
97 }; 97 };
98 98
99 } // namespace chromeos 99 } // namespace chromeos
100 100
101 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_ 101 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_WIFI_CONFIG_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698