| 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> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "ash/system/system_notifier.h" | 12 #include "ash/system/system_notifier.h" |
| 13 #include "ash/system/tray/system_tray_notifier.h" | 13 #include "ash/system/tray/system_tray_notifier.h" |
| 14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| 17 #include "base/memory/ref_counted.h" | 17 #include "base/memory/ref_counted.h" |
| 18 #include "base/memory/scoped_ptr.h" | 18 #include "base/memory/scoped_ptr.h" |
| 19 #include "base/message_loop/message_loop.h" | 19 #include "base/message_loop/message_loop.h" |
| 20 #include "base/metrics/histogram.h" | 20 #include "base/metrics/histogram.h" |
| 21 #include "base/prefs/pref_service.h" | |
| 22 #include "base/strings/string16.h" | 21 #include "base/strings/string16.h" |
| 23 #include "base/strings/string_number_conversions.h" | 22 #include "base/strings/string_number_conversions.h" |
| 24 #include "base/strings/utf_string_conversions.h" | 23 #include "base/strings/utf_string_conversions.h" |
| 25 #include "chrome/browser/browser_process.h" | 24 #include "chrome/browser/browser_process.h" |
| 26 #include "chrome/browser/browser_process_platform_part.h" | 25 #include "chrome/browser/browser_process_platform_part.h" |
| 27 #include "chrome/browser/chromeos/mobile/mobile_activator.h" | 26 #include "chrome/browser/chromeos/mobile/mobile_activator.h" |
| 28 #include "chrome/browser/chromeos/net/network_portal_web_dialog.h" | 27 #include "chrome/browser/chromeos/net/network_portal_web_dialog.h" |
| 29 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 28 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 30 #include "chrome/browser/chromeos/policy/consumer_management_service.h" | 29 #include "chrome/browser/chromeos/policy/consumer_management_service.h" |
| 31 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 30 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 32 #include "chrome/browser/profiles/profile_manager.h" | 31 #include "chrome/browser/profiles/profile_manager.h" |
| 33 #include "chrome/browser/ui/browser_dialogs.h" | 32 #include "chrome/browser/ui/browser_dialogs.h" |
| 34 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 33 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
| 35 #include "chrome/browser/ui/singleton_tabs.h" | 34 #include "chrome/browser/ui/singleton_tabs.h" |
| 36 #include "chrome/common/pref_names.h" | 35 #include "chrome/common/pref_names.h" |
| 37 #include "chrome/grit/generated_resources.h" | 36 #include "chrome/grit/generated_resources.h" |
| 38 #include "chrome/grit/theme_resources.h" | 37 #include "chrome/grit/theme_resources.h" |
| 39 #include "chromeos/chromeos_switches.h" | 38 #include "chromeos/chromeos_switches.h" |
| 40 #include "chromeos/network/network_state.h" | 39 #include "chromeos/network/network_state.h" |
| 41 #include "chromeos/network/network_state_handler.h" | 40 #include "chromeos/network/network_state_handler.h" |
| 42 #include "chromeos/network/network_type_pattern.h" | 41 #include "chromeos/network/network_type_pattern.h" |
| 43 #include "components/captive_portal/captive_portal_detector.h" | 42 #include "components/captive_portal/captive_portal_detector.h" |
| 43 #include "components/prefs/pref_service.h" |
| 44 #include "components/user_manager/user_manager.h" | 44 #include "components/user_manager/user_manager.h" |
| 45 #include "extensions/browser/api/networking_config/networking_config_service.h" | 45 #include "extensions/browser/api/networking_config/networking_config_service.h" |
| 46 #include "extensions/browser/api/networking_config/networking_config_service_fac
tory.h" | 46 #include "extensions/browser/api/networking_config/networking_config_service_fac
tory.h" |
| 47 #include "third_party/cros_system_api/dbus/service_constants.h" | 47 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 48 #include "ui/base/l10n/l10n_util.h" | 48 #include "ui/base/l10n/l10n_util.h" |
| 49 #include "ui/base/resource/resource_bundle.h" | 49 #include "ui/base/resource/resource_bundle.h" |
| 50 #include "ui/message_center/message_center.h" | 50 #include "ui/message_center/message_center.h" |
| 51 #include "ui/message_center/notification.h" | 51 #include "ui/message_center/notification.h" |
| 52 #include "ui/message_center/notification_types.h" | 52 #include "ui/message_center/notification_types.h" |
| 53 #include "ui/message_center/notifier_settings.h" | 53 #include "ui/message_center/notifier_settings.h" |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 if (dialog_) | 441 if (dialog_) |
| 442 dialog_->Close(); | 442 dialog_->Close(); |
| 443 } | 443 } |
| 444 | 444 |
| 445 const NetworkPortalWebDialog* | 445 const NetworkPortalWebDialog* |
| 446 NetworkPortalNotificationController::GetDialogForTesting() const { | 446 NetworkPortalNotificationController::GetDialogForTesting() const { |
| 447 return dialog_; | 447 return dialog_; |
| 448 } | 448 } |
| 449 | 449 |
| 450 } // namespace chromeos | 450 } // namespace chromeos |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1658793002:
Update chrome for new prefs location. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master