| Index: chrome/browser/ui/gtk/location_bar_view_gtk.h
|
| diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h
|
| index 0280e9514d52aed8ce21ad4eeefee942be21f9ab..2943a1a2ef26ca4123c7cc296cf8e85c5ec5e48d 100644
|
| --- a/chrome/browser/ui/gtk/location_bar_view_gtk.h
|
| +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 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.
|
|
|
| @@ -19,7 +19,6 @@
|
| #include "chrome/browser/autocomplete/autocomplete_edit.h"
|
| #include "chrome/browser/extensions/extension_context_menu_model.h"
|
| #include "chrome/browser/extensions/image_loading_tracker.h"
|
| -#include "chrome/browser/first_run/first_run.h"
|
| #include "chrome/browser/prefs/pref_member.h"
|
| #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
|
| #include "chrome/browser/ui/gtk/menu_gtk.h"
|
| @@ -112,7 +111,7 @@ class LocationBarViewGtk : public AutocompleteEditController,
|
| virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE;
|
|
|
| // Implement the LocationBar interface.
|
| - virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE;
|
| + virtual void ShowFirstRunBubble() OVERRIDE;
|
| virtual void SetSuggestedText(const string16& text,
|
| InstantCompleteBehavior behavior) OVERRIDE;
|
| virtual string16 GetInputString() const OVERRIDE;
|
| @@ -336,7 +335,7 @@ class LocationBarViewGtk : public AutocompleteEditController,
|
| // Set the keyword text for the "Press tab to search BLAH" hint box.
|
| void SetKeywordHintLabel(const string16& keyword);
|
|
|
| - void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
|
| + void ShowFirstRunBubbleInternal();
|
|
|
| // Show or hide |tab_to_search_box_| and |tab_to_search_hint_| according to
|
| // the value of |show_selected_keyword_|, |show_keyword_hint_|, and the
|
| @@ -416,7 +415,7 @@ class LocationBarViewGtk : public AutocompleteEditController,
|
| content::PageTransition transition_;
|
|
|
| // Used to schedule a task for the first run bubble.
|
| - base::WeakPtrFactory<LocationBarViewGtk> first_run_bubble_;
|
| + base::WeakPtrFactory<LocationBarViewGtk> weak_ptr_factory_;
|
|
|
| // When true, the location bar view is read only and also is has a slightly
|
| // different presentation (font size / color). This is used for popups.
|
|
|