chrome/browser/ui/views/message_center/web_notification_tray.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

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.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/notification_bubble_wrapper.cc ('k') | chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc » ('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 "base/i18n/number_formatting.h"	7 #include "base/i18n/number_formatting.h"

8 #include "base/string16.h"	8 #include "base/string16.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

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

12 #include "chrome/browser/status_icons/status_tray.h"	12 #include "chrome/browser/status_icons/status_tray.h"

13 #include "chrome/browser/ui/views/message_center/notification_bubble_wrapper.h"	13 #include "chrome/browser/ui/views/message_center/notification_bubble_wrapper.h"

14 #include "content/public/browser/user_metrics.h"	14 #include "content/public/browser/user_metrics.h"

15 #include "grit/chromium_strings.h"	15 #include "grit/chromium_strings.h"

16 #include "grit/theme_resources.h"	16 #include "grit/theme_resources.h"

17 #include "grit/ui_strings.h"	17 #include "grit/ui_strings.h"

18 #include "ui/base/l10n/l10n_util.h"	18 #include "ui/base/l10n/l10n_util.h"

19 #include "ui/base/models/simple_menu_model.h"	19 #include "ui/base/models/simple_menu_model.h"

(...skipping 302 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
322	322

323 message_center::MessageCenterBubble*	323 message_center::MessageCenterBubble*

324 WebNotificationTray::GetMessageCenterBubbleForTest() {	324 WebNotificationTray::GetMessageCenterBubbleForTest() {

325 if (!message_center_bubble_.get())	325 if (!message_center_bubble_.get())

326 return NULL;	326 return NULL;

327 return static_cast<message_center::MessageCenterBubble*>(	327 return static_cast<message_center::MessageCenterBubble*>(

328 message_center_bubble_->bubble());	328 message_center_bubble_->bubble());

329 }	329 }

330	330

331 } // namespace message_center	331 } // namespace message_center

OLD	NEW