chrome/browser/ui/views/message_center/web_notification_tray_win.cc - Issue 110693004: Moves the notification icon out of the status area overflow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/message_center/web_notification_tray_win.cc

Issue 110693004: Moves the notification icon out of the status area overflow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 6 years, 9 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

« no previous file with comments | « chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc ('k') | chrome/browser/ui/views/status_icons/status_icon_win.h » ('j') | chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/message_center/web_notification_tray_win.cc

diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_win.cc b/chrome/browser/ui/views/message_center/web_notification_tray_win.cc

index 8df1becd7227e6fdbbb736bbe79ecd2ce9d19855..751e6b86f8e7bb66fa71b52b658274d7eb3e1965 100644

--- a/chrome/browser/ui/views/message_center/web_notification_tray_win.cc

+++ b/chrome/browser/ui/views/message_center/web_notification_tray_win.cc

@@ -5,7 +5,10 @@

#include "chrome/browser/ui/views/message_center/web_notification_tray.h"

#include <windows.h>

+#include <objbase.h>

sky 2014/04/04 21:13:25 nit: Are all of these new includes really necessar

dewittj 2014/04/04 22:35:57 No, they are leftovers from previous versions of t

+#include "base/memory/ref_counted.h"

+#include "base/win/scoped_com_initializer.h"

#include "base/win/windows_version.h"

#include "chrome/browser/app_icon_win.h"

#include "chrome/browser/profiles/profile_manager.h"

@@ -14,6 +17,7 @@

#include "chrome/browser/ui/host_desktop.h"

#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"

#include "chrome/browser/ui/singleton_tabs.h"

+#include "chrome/browser/ui/views/status_icons/status_icon_win.h"

#include "chrome/common/url_constants.h"

#include "grit/chromium_strings.h"

#include "third_party/skia/include/core/SkBitmap.h"

@@ -56,4 +60,10 @@ void WebNotificationTray::DisplayFirstRunBalloon() {

l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_BALLOON_TITLE),

l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_BALLOON_TEXT));

}

+void WebNotificationTray::EnforceStatusIconVisible() {

+ DCHECK(status_icon_);

+ status_icon_->ForceVisible();

} // namespace message_center