Reland r265807: "Moves the notification icon out of th..."

chrome/browser/ui/views/message_center/web_notification_tray.cc

 // Copyright 2013 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/ui/views/message_center/web_notification_tray.h"
 
 #include "base/i18n/number_formatting.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_icon_menu_model.h"
 #include "chrome/browser/status_icons/status_tray.h"
+#include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
@@ skipping 90 matching lines @@
   anchor_alignment =
       (Alignment)(anchor_alignment |
                   (center.x() > corner.x() ? ALIGNMENT_LEFT : ALIGNMENT_RIGHT));
 
   return anchor_alignment;
 }
 
 }  // namespace internal
 
 MessageCenterTrayDelegate* CreateMessageCenterTray() {
-  return new WebNotificationTray();
+  return new WebNotificationTray(g_browser_process->local_state());
 }
 
-WebNotificationTray::WebNotificationTray()
+WebNotificationTray::WebNotificationTray(PrefService* local_state)
     : message_center_delegate_(NULL),
       status_icon_(NULL),
       status_icon_menu_(NULL),
       should_update_tray_content_(true) {
   message_center_tray_.reset(
       new MessageCenterTray(this, g_browser_process->message_center()));
   last_quiet_mode_state_ = message_center()->IsQuietMode();
   popup_collection_.reset(new message_center::MessagePopupCollection(
       NULL, message_center(), message_center_tray_.get(), false));
+
+#if defined(OS_WIN)
+  // |local_state| can be NULL in tests.
+  if (local_state) {
+    did_force_tray_visible_.reset(new BooleanPrefMember());
+    did_force_tray_visible_->Init(prefs::kMessageCenterForcedOnTaskbar,
+                                  local_state);
+  }
+#endif
 }
 
 WebNotificationTray::~WebNotificationTray() {
   // Reset this early so that delegated events during destruction don't cause
   // problems.
   popup_collection_.reset();
   message_center_tray_.reset();
   DestroyStatusIcon();
 }
 
@@ skipping 186 matching lines @@
   if (!status_tray)
     return;
 
   status_icon_ = status_tray->CreateStatusIcon(
       StatusTray::NOTIFICATION_TRAY_ICON, image, tool_tip);
   if (!status_icon_)
     return;
 
   status_icon_->AddObserver(this);
   AddQuietModeMenu(status_icon_);
+#if defined(OS_WIN)
+  if (did_force_tray_visible_.get() && !did_force_tray_visible_->GetValue()) {
+    EnforceStatusIconVisible();
+    did_force_tray_visible_->SetValue(true);
+  }
+#endif
 }
 
 void WebNotificationTray::DestroyStatusIcon() {
   if (!status_icon_)
     return;
 
   status_icon_->RemoveObserver(this);
   StatusTray* status_tray = g_browser_process->status_tray();
   if (status_tray)
     status_tray->RemoveStatusIcon(status_icon_);
@@ skipping 16 matching lines @@
   status_icon_menu_ = menu.get();
   status_icon->SetContextMenu(menu.Pass());
 }
 
 MessageCenterWidgetDelegate*
 WebNotificationTray::GetMessageCenterWidgetDelegateForTest() {
   return message_center_delegate_;
 }
 
 }  // namespace message_center