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

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

Issue 2829163004: Remove uses of base::hash_map from //chrome (Closed)
Patch Set: Downloads back Created 3 years, 5 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 CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/containers/hash_tables.h"
14 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
15 #include "base/macros.h" 14 #include "base/macros.h"
16 #include "base/memory/linked_ptr.h" 15 #include "base/memory/linked_ptr.h"
17 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
18 #include "base/observer_list.h" 17 #include "base/observer_list.h"
19 #include "base/time/time.h" 18 #include "base/time/time.h"
20 #include "base/timer/timer.h" 19 #include "base/timer/timer.h"
21 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 20 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
22 #include "chrome/browser/chromeos/login/screen_manager.h" 21 #include "chrome/browser/chromeos/login/screen_manager.h"
23 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" 22 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 std::unique_ptr<TimeZoneProvider> timezone_provider_; 423 std::unique_ptr<TimeZoneProvider> timezone_provider_;
425 424
426 // Pairing controller for shark devices. 425 // Pairing controller for shark devices.
427 std::unique_ptr<pairing_chromeos::ControllerPairingController> 426 std::unique_ptr<pairing_chromeos::ControllerPairingController>
428 shark_controller_; 427 shark_controller_;
429 428
430 // Pairing controller for remora devices. 429 // Pairing controller for remora devices.
431 std::unique_ptr<pairing_chromeos::HostPairingController> remora_controller_; 430 std::unique_ptr<pairing_chromeos::HostPairingController> remora_controller_;
432 431
433 // Maps screen names to last time of their shows. 432 // Maps screen names to last time of their shows.
434 base::hash_map<std::string, base::Time> screen_show_times_; 433 std::map<std::string, base::Time> screen_show_times_;
435 434
436 // Tests check result of timezone resolve. 435 // Tests check result of timezone resolve.
437 bool timezone_resolved_ = false; 436 bool timezone_resolved_ = false;
438 base::Closure on_timezone_resolved_for_testing_; 437 base::Closure on_timezone_resolved_for_testing_;
439 438
440 // Listens for incoming connection from a shark controller if a regular (not 439 // Listens for incoming connection from a shark controller if a regular (not
441 // pairing) remora OOBE is active. If connection is established, wizard 440 // pairing) remora OOBE is active. If connection is established, wizard
442 // conroller swithces to a pairing OOBE. 441 // conroller swithces to a pairing OOBE.
443 std::unique_ptr<pairing_chromeos::SharkConnectionListener> 442 std::unique_ptr<pairing_chromeos::SharkConnectionListener>
444 shark_connection_listener_; 443 shark_connection_listener_;
445 444
446 BaseScreen* hid_screen_ = nullptr; 445 BaseScreen* hid_screen_ = nullptr;
447 446
448 base::WeakPtrFactory<WizardController> weak_factory_; 447 base::WeakPtrFactory<WizardController> weak_factory_;
449 448
450 DISALLOW_COPY_AND_ASSIGN(WizardController); 449 DISALLOW_COPY_AND_ASSIGN(WizardController);
451 }; 450 };
452 451
453 } // namespace chromeos 452 } // namespace chromeos
454 453
455 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 454 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698