chrome/browser/task_manager/task_manager_notification_browsertest.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

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/task_manager/task_manager_notification_browsertest.cc

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/task_manager/task_manager.h"	5 #include "chrome/browser/task_manager/task_manager.h"

6	6

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

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

9 #include "chrome/browser/extensions/extension_browsertest.h"	9 #include "chrome/browser/extensions/extension_browsertest.h"

10 #include "chrome/browser/notifications/desktop_notification_service.h"	10 #include "chrome/browser/notifications/desktop_notification_service.h"

11 #include "chrome/browser/notifications/notification.h"	11 #include "chrome/browser/notifications/notification.h"

12 #include "chrome/browser/notifications/notification_test_util.h"	12 #include "chrome/browser/notifications/notification_test_util.h"

13 #include "chrome/browser/notifications/notification_ui_manager.h"	13 #include "chrome/browser/notifications/notification_ui_manager.h"

14 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"	14 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"

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

16 #include "chrome/browser/ui/browser_dialogs.h"	16 #include "chrome/browser/ui/browser_dialogs.h"

17 #include "chrome/browser/ui/browser_window.h"	17 #include "chrome/browser/ui/browser_window.h"

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74	74

75 notifications->Add(n1, browser()->profile());	75 notifications->Add(n1, browser()->profile());

76 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);	76 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);

77 notifications->Add(n2, browser()->profile());	77 notifications->Add(n2, browser()->profile());

78 TaskManagerBrowserTestUtil::WaitForWebResourceChange(3);	78 TaskManagerBrowserTestUtil::WaitForWebResourceChange(3);

79 notifications->CancelById(n1.notification_id());	79 notifications->CancelById(n1.notification_id());

80 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);	80 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);

81 notifications->CancelById(n2.notification_id());	81 notifications->CancelById(n2.notification_id());

82 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);	82 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);

83 }	83 }

OLD	NEW