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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/message_center/web_notification_tray_win.cc

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

Patch Set: Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log

« 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') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/ui/views/message_center/web_notification_tray.h"	5 #include "chrome/browser/ui/views/message_center/web_notification_tray.h"

6	6

7 #include <windows.h>	7 #include <windows.h>

	8

8 #include "base/win/windows_version.h"	9 #include "base/win/windows_version.h"

9 #include "chrome/browser/app_icon_win.h"	10 #include "chrome/browser/app_icon_win.h"

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

11 #include "chrome/browser/status_icons/status_icon.h"	12 #include "chrome/browser/status_icons/status_icon.h"

12 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

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

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

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

16 #include "chrome/common/url_constants.h"	17 #include "chrome/common/url_constants.h"

17 #include "grit/chromium_strings.h"	18 #include "grit/chromium_strings.h"

(...skipping 30 matching lines...) Expand all Loading...
48 icon_size = GetSystemMetrics(SM_CXSMICON);	49 icon_size = GetSystemMetrics(SM_CXSMICON);

49	50

50 scoped_ptr<SkBitmap> sized_app_icon_bitmap = GetAppIconForSize(icon_size);	51 scoped_ptr<SkBitmap> sized_app_icon_bitmap = GetAppIconForSize(icon_size);

51 gfx::ImageSkia sized_app_icon_skia =	52 gfx::ImageSkia sized_app_icon_skia =

52 gfx::ImageSkia::CreateFrom1xBitmap(*sized_app_icon_bitmap);	53 gfx::ImageSkia::CreateFrom1xBitmap(*sized_app_icon_bitmap);

53 status_icon_->DisplayBalloon(	54 status_icon_->DisplayBalloon(

54 sized_app_icon_skia,	55 sized_app_icon_skia,

55 l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_BALLOON_TITLE),	56 l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_BALLOON_TITLE),

56 l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_BALLOON_TEXT));	57 l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_BALLOON_TEXT));

57 }	58 }

58

59 void WebNotificationTray::EnforceStatusIconVisible() {

60 DCHECK(status_icon_);

61 status_icon_->ForceVisible();

62 }

63

64 } // namespace message_center	59 } // namespace message_center

OLD	NEW