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

Side by Side Diff: chrome/browser/chromeos/login/network_screen.h

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)
Patch Set: rebased ToT Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_LOGIN_NETWORK_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string>
10
11 #include "base/task.h" 9 #include "base/task.h"
12 #include "base/timer.h" 10 #include "base/timer.h"
11 #include "base/string16.h"
13 #include "chrome/browser/chromeos/cros/network_library.h" 12 #include "chrome/browser/chromeos/cros/network_library.h"
14 #include "chrome/browser/chromeos/login/network_screen_delegate.h" 13 #include "chrome/browser/chromeos/login/network_screen_delegate.h"
15 #include "chrome/browser/chromeos/login/language_switch_menu.h" 14 #include "chrome/browser/chromeos/login/language_switch_menu.h"
16 #include "chrome/browser/chromeos/login/view_screen.h" 15 #include "chrome/browser/chromeos/login/view_screen.h"
17 #include "chrome/browser/chromeos/network_list.h" 16 #include "chrome/browser/chromeos/network_list.h"
18 #include "chrome/browser/chromeos/options/network_config_view.h" 17 #include "chrome/browser/chromeos/options/network_config_view.h"
19 18
20 class WizardScreenDelegate; 19 class WizardScreenDelegate;
21 20
22 namespace chromeos { 21 namespace chromeos {
23 22
24 class NetworkSelectionView; 23 class NetworkSelectionView;
25 24
26 class NetworkScreen : public ViewScreen<NetworkSelectionView>, 25 class NetworkScreen : public ViewScreen<NetworkSelectionView>,
27 public NetworkScreenDelegate, 26 public NetworkScreenDelegate,
28 public NetworkConfigView::Delegate { 27 public NetworkConfigView::Delegate {
29 public: 28 public:
30 NetworkScreen(WizardScreenDelegate* delegate, bool is_out_of_box); 29 NetworkScreen(WizardScreenDelegate* delegate, bool is_out_of_box);
31 virtual ~NetworkScreen(); 30 virtual ~NetworkScreen();
32 31
33 // NetworkScreenDelegate implementation: 32 // NetworkScreenDelegate implementation:
34 virtual LanguageSwitchMenu* language_switch_menu() { 33 virtual LanguageSwitchMenu* language_switch_menu() {
35 return &language_switch_menu_; 34 return &language_switch_menu_;
36 } 35 }
37 36
38 // ComboboxModel implementation: 37 // ComboboxModel implementation:
39 virtual int GetItemCount(); 38 virtual int GetItemCount();
40 virtual std::wstring GetItemAt(int index); 39 virtual string16 GetItemAt(int index);
41 40
42 // views::Combobox::Listener implementation: 41 // views::Combobox::Listener implementation:
43 virtual void ItemChanged(views::Combobox* sender, 42 virtual void ItemChanged(views::Combobox* sender,
44 int prev_index, 43 int prev_index,
45 int new_index); 44 int new_index);
46 45
47 // views::ButtonListener implementation: 46 // views::ButtonListener implementation:
48 virtual void ButtonPressed(views::Button* sender, const views::Event& event); 47 virtual void ButtonPressed(views::Button* sender, const views::Event& event);
49 48
50 // NetworkLibrary::Observer implementation: 49 // NetworkLibrary::Observer implementation:
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 131
133 ScopedRunnableMethodFactory<NetworkScreen> task_factory_; 132 ScopedRunnableMethodFactory<NetworkScreen> task_factory_;
134 LanguageSwitchMenu language_switch_menu_; 133 LanguageSwitchMenu language_switch_menu_;
135 134
136 DISALLOW_COPY_AND_ASSIGN(NetworkScreen); 135 DISALLOW_COPY_AND_ASSIGN(NetworkScreen);
137 }; 136 };
138 137
139 } // namespace chromeos 138 } // namespace chromeos
140 139
141 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_ 140 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/recently_used_folders_combo_model.cc ('k') | chrome/browser/chromeos/login/network_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698