Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 8342048: Make NotificationService an interface in the content namespace, and switch callers to use it. Mov... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/browser.cc ('k') | chrome/browser/ui/browser_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_browsertest.cc
===================================================================
--- chrome/browser/ui/browser_browsertest.cc (revision 106380)
+++ chrome/browser/ui/browser_browsertest.cc (working copy)
@@ -40,6 +40,7 @@
#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
#include "content/public/common/page_transition_types.h"
#include "content/public/common/url_constants.h"
@@ -299,7 +300,7 @@
ui_test_utils::WindowedNotificationObserver host_destroyed_observer(
content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
// Cancel the dialog.
AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
@@ -380,10 +381,10 @@
ui_test_utils::WindowedNotificationObserver popup_observer(
content::NOTIFICATION_TAB_ADDED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
ui_test_utils::WindowedNotificationObserver nav_observer(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
oldtab->render_view_host()->
ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(redirect_popup));
@@ -413,10 +414,10 @@
ui_test_utils::WindowedNotificationObserver popup_observer2(
content::NOTIFICATION_TAB_ADDED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
ui_test_utils::WindowedNotificationObserver nav_observer2(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
oldtab->render_view_host()->
ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(refresh_popup));
@@ -465,10 +466,10 @@
ui_test_utils::WindowedNotificationObserver popup_observer(
content::NOTIFICATION_TAB_ADDED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
ui_test_utils::WindowedNotificationObserver nav_observer(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
oldtab->render_view_host()->
ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(dont_fork_popup));
@@ -494,7 +495,7 @@
ui_test_utils::WindowedNotificationObserver nav_observer2(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
oldtab->render_view_host()->
ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(navigate_str));
nav_observer2.Wait();
@@ -824,7 +825,7 @@
{
ui_test_utils::WindowedNotificationObserver fullscreen_observer(
chrome::NOTIFICATION_FULLSCREEN_CHANGED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
fullscreen_observer.Wait();
ASSERT_TRUE(browser()->window()->IsFullscreen());
@@ -833,7 +834,7 @@
{
ui_test_utils::WindowedNotificationObserver fullscreen_observer(
chrome::NOTIFICATION_FULLSCREEN_CHANGED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
AddTabAtIndex(
1, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED);
fullscreen_observer.Wait();
@@ -860,7 +861,7 @@
{
ui_test_utils::WindowedNotificationObserver fullscreen_observer(
chrome::NOTIFICATION_FULLSCREEN_CHANGED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
fullscreen_observer.Wait();
ASSERT_TRUE(browser()->window()->IsFullscreen());
@@ -869,7 +870,7 @@
{
ui_test_utils::WindowedNotificationObserver fullscreen_observer(
chrome::NOTIFICATION_FULLSCREEN_CHANGED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
browser()->ToggleFullscreenModeForTab(fullscreen_tab, false);
fullscreen_observer.Wait();
ASSERT_FALSE(browser()->window()->IsFullscreen());
@@ -896,7 +897,7 @@
{
ui_test_utils::WindowedNotificationObserver fullscreen_observer(
chrome::NOTIFICATION_FULLSCREEN_CHANGED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
fullscreen_observer.Wait();
ASSERT_TRUE(browser()->window()->IsFullscreen());
@@ -927,7 +928,7 @@
{
ui_test_utils::WindowedNotificationObserver fullscreen_observer(
chrome::NOTIFICATION_FULLSCREEN_CHANGED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
EXPECT_FALSE(browser()->window()->IsFullscreen());
EXPECT_FALSE(browser()->window()->InPresentationMode());
browser()->ToggleFullscreenModeForTab(fullscreen_tab, true);
@@ -939,7 +940,7 @@
{
ui_test_utils::WindowedNotificationObserver fullscreen_observer(
chrome::NOTIFICATION_FULLSCREEN_CHANGED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
browser()->TogglePresentationMode(false);
fullscreen_observer.Wait();
ASSERT_FALSE(browser()->window()->IsFullscreen());
@@ -951,7 +952,7 @@
// on Lion.
ui_test_utils::WindowedNotificationObserver fullscreen_observer(
chrome::NOTIFICATION_FULLSCREEN_CHANGED,
- NotificationService::AllSources());
+ content::NotificationService::AllSources());
browser()->ToggleFullscreenMode(false);
fullscreen_observer.Wait();
ASSERT_TRUE(browser()->window()->IsFullscreen());
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698