| Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| index 9ada62d564da2ce41c993d2484fd7a2df4b18b51..6f5d399ff9e8fe62caeeeba512b92c310748476b 100644
|
| --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| @@ -12,7 +12,6 @@
|
| #include "base/stl_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/app/chrome_command_ids.h"
|
| -#include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/command_updater.h"
|
| #include "chrome/browser/defaults.h"
|
| #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
|
| @@ -64,7 +63,6 @@
|
| #include "components/search_engines/template_url.h"
|
| #include "components/search_engines/template_url_service.h"
|
| #include "components/translate/core/browser/language_state.h"
|
| -#include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/render_widget_host_view.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "extensions/browser/extension_registry.h"
|
| @@ -403,14 +401,6 @@ void LocationBarView::Init() {
|
| hide_url_animation_->SetTweenType(kHideTweenType);
|
| hide_url_animation_->SetSlideDuration(175);
|
|
|
| - content::Source<Profile> profile_source = content::Source<Profile>(profile());
|
| - registrar_.Add(this,
|
| - extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
|
| - profile_source);
|
| - registrar_.Add(this,
|
| - extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
|
| - profile_source);
|
| -
|
| // Initialize the location entry. We do this to avoid a black flash which is
|
| // visible when the location entry has just been initialized.
|
| Update(NULL);
|
| @@ -1693,23 +1683,6 @@ void LocationBarView::OnTemplateURLServiceChanged() {
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// LocationBarView, private content::NotificationObserver implementation:
|
| -
|
| -void LocationBarView::Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) {
|
| - switch (type) {
|
| - case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED:
|
| - case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
|
| - Update(NULL);
|
| - break;
|
| -
|
| - default:
|
| - NOTREACHED() << "Unexpected notification.";
|
| - }
|
| -}
|
| -
|
| -////////////////////////////////////////////////////////////////////////////////
|
| // LocationBarView, private SearchModelObserver implementation:
|
|
|
| void LocationBarView::ModelChanged(const SearchModel::State& old_state,
|
|
|