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

chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.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/ui/gtk/omnibox/omnibox_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "third_party/undoview/undo_view.h"
 #include "ui/base/animation/multi_animation.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 168 matching lines @@
   popup_view_.reset(
 #if defined(TOOLKIT_VIEWS)
       new AutocompletePopupContentsView
 #else
       new OmniboxPopupViewGtk
 #endif
           (GetFont(), this, model_.get(), profile, location_bar));
 }
 
 OmniboxViewGtk::~OmniboxViewGtk() {
-  NotificationService::current()->Notify(NotificationType::OMNIBOX_DESTROYED,
+  NotificationService::current()->Notify(chrome::OMNIBOX_DESTROYED,
                                          Source<OmniboxViewGtk>(this),
                                          NotificationService::NoDetails());
 
   // Explicitly teardown members which have a reference to us.  Just to be safe
   // we want them to be destroyed before destroying any other internal state.
   popup_view_.reset();
   model_.reset();
 
   // We own our widget and TextView related objects.
   if (alignment_.get()) {  // Init() has been called.
@@ skipping 175 matching lines @@
   ui::MultiAnimation::Parts parts;
   parts.push_back(ui::MultiAnimation::Part(
       InstantController::kAutoCommitPauseTimeMS, ui::Tween::ZERO));
   parts.push_back(ui::MultiAnimation::Part(
       InstantController::kAutoCommitFadeInTimeMS, ui::Tween::EASE_IN));
   instant_animation_.reset(new ui::MultiAnimation(parts));
   instant_animation_->set_continuous(false);
 
 #if !defined(TOOLKIT_VIEWS)
   registrar_.Add(this,
-                 NotificationType::BROWSER_THEME_CHANGED,
+                 chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   theme_service_->InitThemesFor(this);
 #else
   // Manually invoke SetBaseColor() because TOOLKIT_VIEWS doesn't observe
   // themes.
   SetBaseColor();
 #endif
 
   ViewIDUtil::SetID(GetNativeView(), VIEW_ID_AUTOCOMPLETE);
 }
@@ skipping 481 matching lines @@
   // Make all the children of the widget visible. NOTE: this won't display
   // anything, it just toggles the visible flag.
   gtk_widget_show_all(omnibox_view->GetNativeView());
   // Hide the widget. NativeViewHostGtk will make it visible again as necessary.
   gtk_widget_hide(omnibox_view->GetNativeView());
 
   return omnibox_view;
 }
 #endif
 
-void OmniboxViewGtk::Observe(NotificationType type,
+void OmniboxViewGtk::Observe(int type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
-  DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
+  DCHECK(type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
 
   SetBaseColor();
 }
 
 void OmniboxViewGtk::AnimationEnded(const ui::Animation* animation) {
   model_->CommitSuggestedText(false);
 }
 
 void OmniboxViewGtk::AnimationProgressed(const ui::Animation* animation) {
   UpdateInstantViewColors();
@@ skipping 1405 matching lines @@
   // baseline, so we need to move the |instant_view_| down to make sure it
   // has the same baseline as the |text_view_|.
   PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_));
   int height;
   pango_layout_get_size(layout, NULL, &height);
   PangoLayoutIter* iter = pango_layout_get_iter(layout);
   int baseline = pango_layout_iter_get_baseline(iter);
   pango_layout_iter_free(iter);
   g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL);
 }