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

chrome/browser/chromeos/media/media_player.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 "chrome/browser/chromeos/media/media_player.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/file_manager_util.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/url_fetcher.h"
 #include "grit/browser_resources.h"
@@ skipping 115 matching lines @@
 
 void MediaPlayer::SetPlaybackError(GURL const& url) {
   for (size_t x = 0; x < current_playlist_.size(); x++) {
     if (current_playlist_[x].url == url) {
       current_playlist_[x].haderror = true;
     }
   }
   NotifyPlaylistChanged();
 }
 
-void MediaPlayer::Observe(NotificationType type,
+void MediaPlayer::Observe(int type,
                           const NotificationSource& source,
                           const NotificationDetails& details) {
-  DCHECK(type == NotificationType::BROWSER_CLOSING);
+  DCHECK(type == chrome::NOTIFICATION_BROWSER_CLOSING);
   registrar_.Remove(this,
-                    NotificationType::BROWSER_CLOSING,
+                    chrome::NOTIFICATION_BROWSER_CLOSING,
                     source);
   if (Source<Browser>(source).ptr() == mediaplayer_browser_) {
     mediaplayer_browser_ = NULL;
   } else if (Source<Browser>(source).ptr() == playlist_browser_) {
     playlist_browser_ = NULL;
   }
 }
 
 void MediaPlayer::NotifyPlaylistChanged() {
   ExtensionMediaPlayerEventRouter::GetInstance()->NotifyPlaylistChanged();
@@ skipping 15 matching lines @@
   }
 }
 
 void MediaPlayer::PopupPlaylist(Browser* creator) {
   Profile* profile = BrowserList::GetLastActive()->profile();
   playlist_browser_ = Browser::CreateForApp(Browser::TYPE_PANEL,
                                             kMediaPlayerAppName,
                                             gfx::Rect(),
                                             profile);
   registrar_.Add(this,
-                 NotificationType::BROWSER_CLOSING,
+                 chrome::NOTIFICATION_BROWSER_CLOSING,
                  Source<Browser>(playlist_browser_));
   playlist_browser_->AddSelectedTabWithURL(GetMediaplayerPlaylistUrl(),
                                            PageTransition::LINK);
   playlist_browser_->window()->SetBounds(gfx::Rect(kPopupLeft,
                                                    kPopupTop,
                                                    kPopupWidth,
                                                    kPopupHeight));
   playlist_browser_->window()->Show();
 }
 
 void MediaPlayer::PopupMediaPlayer(Browser* creator) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(this, &MediaPlayer::PopupMediaPlayer,
                           static_cast<Browser*>(NULL)));
     return;
   }
   Profile* profile = BrowserList::GetLastActive()->profile();
   mediaplayer_browser_ = Browser::CreateForApp(Browser::TYPE_PANEL,
                                                kMediaPlayerAppName,
                                                gfx::Rect(),
                                                profile);
   registrar_.Add(this,
-                 NotificationType::BROWSER_CLOSING,
+                 chrome::NOTIFICATION_BROWSER_CLOSING,
                  Source<Browser>(mediaplayer_browser_));
 
 #if defined(OS_CHROMEOS)
   // Since we are on chromeos, popups should be a PanelBrowserView,
   // so we can just cast it.
   if (creator) {
     chromeos::PanelBrowserView* creatorview =
         static_cast<chromeos::PanelBrowserView*>(creator->window());
     chromeos::PanelBrowserView* view =
         static_cast<chromeos::PanelBrowserView*>(
@@ skipping 60 matching lines @@
 
 MediaPlayer::MediaPlayer()
     : current_position_(0),
       pending_playback_request_(false),
       playlist_browser_(NULL),
       mediaplayer_browser_(NULL) {
   for (size_t i = 0; i < arraysize(supported_mime_type_list); ++i) {
     supported_mime_types_.insert(supported_mime_type_list[i]);
   }
 };