| Index: chrome/browser/google/google_url_tracker.cc
|
| ===================================================================
|
| --- chrome/browser/google/google_url_tracker.cc (revision 106237)
|
| +++ chrome/browser/google/google_url_tracker.cc (working copy)
|
| @@ -22,7 +22,7 @@
|
| #include "chrome/common/pref_names.h"
|
| #include "content/browser/tab_contents/navigation_controller.h"
|
| #include "content/browser/tab_contents/tab_contents.h"
|
| -#include "content/common/notification_service.h"
|
| +#include "content/public/browser/notification_service.h"
|
| #include "grit/generated_resources.h"
|
| #include "net/base/load_flags.h"
|
| #include "net/base/net_util.h"
|
| @@ -278,10 +278,10 @@
|
| google_url_.spec());
|
| g_browser_process->local_state()->SetString(prefs::kLastPromptedGoogleURL,
|
| google_url_.spec());
|
| - NotificationService::current()->Notify(
|
| + content::NotificationService::current()->Notify(
|
| chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
|
| - NotificationService::AllSources(),
|
| - NotificationService::NoDetails());
|
| + content::NotificationService::AllSources(),
|
| + content::NotificationService::NoDetails());
|
| need_to_prompt_ = false;
|
| }
|
|
|
| @@ -343,7 +343,7 @@
|
| // This notification will fire a bit later in the same call chain we're
|
| // currently in.
|
| registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
|
| - NotificationService::AllSources());
|
| + content::NotificationService::AllSources());
|
| }
|
| }
|
|
|
| @@ -353,7 +353,7 @@
|
| controller_ = content::Source<NavigationController>(source).ptr();
|
| search_url_ = pending_url;
|
| registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
|
| - NotificationService::AllSources());
|
| + content::NotificationService::AllSources());
|
| // Start listening for the commit notification. We also need to listen for the
|
| // tab close command since that means the load will never commit.
|
| registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
|
|
|