Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/browser_focus_uitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/view_ids.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/view_messages.h"
@@ skipping 146 matching lines @@
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(TestInterstitialPage, message)
       IPC_MESSAGE_HANDLER(ViewHostMsg_FocusedNodeChanged, OnFocusedNodeChanged)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
     return handled;
   }
 
   void OnFocusedNodeChanged(bool is_editable_node) {
     NotificationService::current()->Notify(
-        NotificationType::FOCUS_CHANGED_IN_PAGE,
+        content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
         Source<TabContents>(tab()),
         Details<const bool>(&is_editable_node));
   }
 
  private:
   std::string html_contents_;
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) {
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
@@ skipping 302 matching lines @@
 
       if (j < arraysize(kExpElementIDs) - 1) {
         // If the next element is the kTextElementID, we expect to be
         // notified we have switched to an editable node.
         bool is_editable_node =
             (strcmp(kTextElementID, kExpElementIDs[j + 1]) == 0);
         Details<bool> details(&is_editable_node);
 
         ASSERT_TRUE(ui_test_utils::SendKeyPressAndWaitWithDetails(
             browser(), ui::VKEY_TAB, false, false, false, false,
-            NotificationType::FOCUS_CHANGED_IN_PAGE,
+            content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
             NotificationSource(Source<TabContents>(
                 browser()->GetSelectedTabContents())),
             details));
       } else {
         // On the last tab key press, the focus returns to the browser.
         ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
             browser(), ui::VKEY_TAB, false, false, false, false,
-            NotificationType::FOCUS_RETURNED_TO_BROWSER,
+            chrome::NOTIFICATION_FOCUS_RETURNED_TO_BROWSER,
             NotificationSource(Source<Browser>(browser()))));
       }
     }
 
     // At this point the renderer has sent us a message asking to advance the
     // focus (as the end of the focus loop was reached in the renderer).
     // We need to run the message loop to process it.
     ui_test_utils::RunAllPendingInMessageLoop();
   }
 
@@ skipping 14 matching lines @@
           kExpElementIDs[arraysize(kExpElementIDs) - 1 - j];
 
       if (j < arraysize(kExpElementIDs) - 1) {
         // If the next element is the kTextElementID, we expect to be
         // notified we have switched to an editable node.
         bool is_editable_node = (strcmp(kTextElementID, next_element) == 0);
         Details<bool> details(&is_editable_node);
 
         ASSERT_TRUE(ui_test_utils::SendKeyPressAndWaitWithDetails(
             browser(), ui::VKEY_TAB, false, true, false, false,
-            NotificationType::FOCUS_CHANGED_IN_PAGE,
+            content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
             NotificationSource(Source<TabContents>(
                 browser()->GetSelectedTabContents())),
             details));
       } else {
         // On the last tab key press, the focus returns to the browser.
         ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
             browser(), ui::VKEY_TAB, false, true, false, false,
-            NotificationType::FOCUS_RETURNED_TO_BROWSER,
+            chrome::NOTIFICATION_FOCUS_RETURNED_TO_BROWSER,
             NotificationSource(Source<Browser>(browser()))));
       }
 
       // Let's make sure the focus is on the expected element in the page.
       std::string actual;
       ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
           browser()->GetSelectedTabContents()->render_view_host(),
           L"",
           L"window.domAutomationController.send(getFocusedElement());",
           &actual));
@@ skipping 51 matching lines @@
     // Now let's press tab to move the focus.
     for (size_t j = 0; j < 7; ++j) {
       // Let's make sure the focus is on the expected element in the page.
       std::string actual;
       ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
           interstitial_page->render_view_host(), L"",
           L"window.domAutomationController.send(getFocusedElement());",
           &actual));
       ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
 
-      NotificationType::Type notification_type;
+      int notification_type;
       NotificationSource notification_source =
           NotificationService::AllSources();
       if (j < arraysize(kExpElementIDs) - 1) {
-        notification_type = NotificationType::FOCUS_CHANGED_IN_PAGE;
+        notification_type = content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE;
         notification_source = Source<TabContents>(
             interstitial_page->tab());
       } else {
         // On the last tab key press, the focus returns to the browser.
-        notification_type = NotificationType::FOCUS_RETURNED_TO_BROWSER;
+        notification_type = chrome::NOTIFICATION_FOCUS_RETURNED_TO_BROWSER;
         notification_source = Source<Browser>(browser());
       }
 
       ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
           browser(), ui::VKEY_TAB, false, false, false, false,
           notification_type, notification_source));
     }
 
     // At this point the renderer has sent us a message asking to advance the
     // focus (as the end of the focus loop was reached in the renderer).
     // We need to run the message loop to process it.
     ui_test_utils::RunAllPendingInMessageLoop();
   }
 
   // Now let's try reverse focus traversal.
   for (int i = 0; i < 2; ++i) {
     // Location bar should be focused.
     ASSERT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR));
 
     // Move the caret to the end, otherwise the next Tab key may not move focus.
     ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
         browser(), ui::VKEY_END, false, false, false, false));
 
     // Now let's press shift-tab to move the focus in reverse.
     for (size_t j = 0; j < 7; ++j) {
-      NotificationType::Type notification_type;
+      int notification_type;
       NotificationSource notification_source =
           NotificationService::AllSources();
       if (j < arraysize(kExpElementIDs) - 1) {
-        notification_type = NotificationType::FOCUS_CHANGED_IN_PAGE;
+        notification_type = content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE;
         notification_source = Source<TabContents>(
             interstitial_page->tab());
       } else {
         // On the last tab key press, the focus returns to the browser.
-        notification_type = NotificationType::FOCUS_RETURNED_TO_BROWSER;
+        notification_type = chrome::NOTIFICATION_FOCUS_RETURNED_TO_BROWSER;
         notification_source = Source<Browser>(browser());
       }
 
       ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
           browser(), ui::VKEY_TAB, false, true, false, false,
           notification_type, notification_source));
 
       // Let's make sure the focus is on the expected element in the page.
       std::string actual;
       ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
@@ skipping 190 matching lines @@
   ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
   browser()->Reload(CURRENT_TAB);
   ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
 
   // Focus should now be on the tab contents.
   browser()->ShowDownloadsTab();
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 }
 
 }  // namespace