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

Unified Diff: chrome/browser/chromeos/net/network_portal_notification_controller.cc

Issue 171423005: Added in-session captive portal notification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Deleted useless NotificaionDisplayed(). Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/net/network_portal_notification_controller.cc
diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller.cc b/chrome/browser/chromeos/net/network_portal_notification_controller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c190fa1d6ea8f502cc161ee2783fe90857b1975c
--- /dev/null
+++ b/chrome/browser/chromeos/net/network_portal_notification_controller.cc
@@ -0,0 +1,136 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
+
+#include "ash/system/system_notifier.h"
+#include "base/basictypes.h"
+#include "base/command_line.h"
+#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/message_loop/message_loop.h"
+#include "base/strings/string16.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/captive_portal/captive_portal_detector.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
+#include "chrome/browser/ui/singleton_tabs.h"
+#include "chromeos/chromeos_switches.h"
+#include "chromeos/network/network_state.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/message_center/message_center.h"
+#include "ui/message_center/notification.h"
+#include "ui/message_center/notification_types.h"
+#include "ui/message_center/notifier_settings.h"
+
+using message_center::Notification;
+
+namespace chromeos {
+
+namespace {
+
+bool IsPortalNotificationEnabled() {
+ return CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableNetworkPortalNotification);
+}
+
+
+void CloseNotification() {
+ message_center::MessageCenter::Get()->RemoveNotification(
+ NetworkPortalNotificationController::kNotificationId, false);
+}
+
+class NetworkPortalNotificationControllerDelegate
+ : public message_center::NotificationDelegate {
+ public:
+ NetworkPortalNotificationControllerDelegate() {}
+
+ // Overridden from message_center::NotificationDelegate:
+ virtual void Display() OVERRIDE {}
+ virtual void Error() OVERRIDE {}
+ virtual void Close(bool /* by_user */) OVERRIDE {}
+ virtual void Click() OVERRIDE {}
+ virtual void ButtonClick(int button_index) OVERRIDE;
+
+ private:
+ virtual ~NetworkPortalNotificationControllerDelegate() {}
+
+ DISALLOW_COPY_AND_ASSIGN(NetworkPortalNotificationControllerDelegate);
+};
+
+void NetworkPortalNotificationControllerDelegate::ButtonClick(
+ int button_index) {
+ if (!button_index)
+ return;
+ Profile* profile = ProfileManager::GetActiveUserProfile();
+ if (!profile)
+ return;
+ chrome::ScopedTabbedBrowserDisplayer displayer(profile,
+ chrome::HOST_DESKTOP_TYPE_ASH);
+ GURL url(captive_portal::CaptivePortalDetector::kDefaultURL);
+ chrome::ShowSingletonTab(displayer.browser(), url);
+
+ CloseNotification();
+}
+
+} // namespace
+
+const char NetworkPortalNotificationController::kNotificationId[] =
+ "chrome://net/network_portal_detector";
+
+NetworkPortalNotificationController::NetworkPortalNotificationController() {}
+
+NetworkPortalNotificationController::~NetworkPortalNotificationController() {}
+
+void NetworkPortalNotificationController::OnPortalDetectionCompleted(
+ const NetworkState* network,
+ const NetworkPortalDetector::CaptivePortalState& state) {
+ if (!IsPortalNotificationEnabled())
+ return;
+
+ if (!network ||
+ state.status != NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL) {
+ last_network_path_.clear();
+ CloseNotification();
+ return;
+ }
+
+ // Don't do anything if notification for |network| already was
+ // displayed.
+ if (network->path() == last_network_path_)
+ return;
+ last_network_path_ = network->path();
+
+ ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+ gfx::Image& icon = bundle.GetImageNamed(IDR_PORTAL_DETECTION_ALERT);
+ message_center::NotifierId notifier_id(
+ message_center::NotifierId::SYSTEM_COMPONENT,
+ ash::system_notifier::kNotifierNetworkPortalDetector);
+
+ message_center::ButtonInfo signin_button(l10n_util::GetStringUTF16(
+ IDS_PORTAL_DETECTION_NOTIFICATION_SIGNIN_BUTTON));
+ signin_button.icon = bundle.GetImageNamed(IDR_PORTAL_DETECTION_GLOBE);
+ message_center::RichNotificationData data;
+ data.buttons.push_back(signin_button);
+
+ scoped_ptr<Notification> notification(new Notification(
+ message_center::NOTIFICATION_TYPE_SIMPLE,
+ kNotificationId,
+ l10n_util::GetStringUTF16(IDS_PORTAL_DETECTION_NOTIFICATION_TITLE),
+ l10n_util::GetStringFUTF16(IDS_PORTAL_DETECTION_NOTIFICATION_MESSAGE,
+ base::UTF8ToUTF16(network->name())),
+ icon,
+ base::string16() /* display_source */,
+ notifier_id,
+ data,
+ new NetworkPortalNotificationControllerDelegate()));
+ notification->SetSystemPriority();
+
+ message_center::MessageCenter::Get()->AddNotification(notification.Pass());
+}
+
+} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698