OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h" | 5 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h" |
6 | 6 |
| 7 #include <stdint.h> |
| 8 |
7 #include <vector> | 9 #include <vector> |
8 | 10 |
9 #include "ash/shell.h" | 11 #include "ash/shell.h" |
10 #include "ash/system/system_notifier.h" | 12 #include "ash/system/system_notifier.h" |
11 #include "ash/system/tray/system_tray_notifier.h" | 13 #include "ash/system/tray/system_tray_notifier.h" |
12 #include "base/basictypes.h" | |
13 #include "base/command_line.h" | 14 #include "base/command_line.h" |
14 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/macros.h" |
15 #include "base/memory/ref_counted.h" | 17 #include "base/memory/ref_counted.h" |
16 #include "base/memory/scoped_ptr.h" | 18 #include "base/memory/scoped_ptr.h" |
17 #include "base/message_loop/message_loop.h" | 19 #include "base/message_loop/message_loop.h" |
18 #include "base/metrics/histogram.h" | 20 #include "base/metrics/histogram.h" |
19 #include "base/prefs/pref_service.h" | 21 #include "base/prefs/pref_service.h" |
20 #include "base/strings/string16.h" | 22 #include "base/strings/string16.h" |
21 #include "base/strings/string_number_conversions.h" | 23 #include "base/strings/string_number_conversions.h" |
22 #include "base/strings/utf_string_conversions.h" | 24 #include "base/strings/utf_string_conversions.h" |
23 #include "chrome/browser/browser_process.h" | 25 #include "chrome/browser/browser_process.h" |
24 #include "chrome/browser/browser_process_platform_part.h" | 26 #include "chrome/browser/browser_process_platform_part.h" |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 if (dialog_) | 441 if (dialog_) |
440 dialog_->Close(); | 442 dialog_->Close(); |
441 } | 443 } |
442 | 444 |
443 const NetworkPortalWebDialog* | 445 const NetworkPortalWebDialog* |
444 NetworkPortalNotificationController::GetDialogForTesting() const { | 446 NetworkPortalNotificationController::GetDialogForTesting() const { |
445 return dialog_; | 447 return dialog_; |
446 } | 448 } |
447 | 449 |
448 } // namespace chromeos | 450 } // namespace chromeos |
OLD | NEW |