Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Side by Side Diff: chrome/browser/ui/gtk/location_bar_view_gtk.h

Issue 10337010: Revert r123782. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 23 matching lines...) Expand all
34 #include "ui/base/gtk/gtk_signal.h" 34 #include "ui/base/gtk/gtk_signal.h"
35 #include "ui/base/gtk/owned_widget_gtk.h" 35 #include "ui/base/gtk/owned_widget_gtk.h"
36 #include "webkit/glue/window_open_disposition.h" 36 #include "webkit/glue/window_open_disposition.h"
37 37
38 class OmniboxViewGtk; 38 class OmniboxViewGtk;
39 class Browser; 39 class Browser;
40 class CommandUpdater; 40 class CommandUpdater;
41 class ContentSettingImageModel; 41 class ContentSettingImageModel;
42 class ContentSettingBubbleGtk; 42 class ContentSettingBubbleGtk;
43 class ExtensionAction; 43 class ExtensionAction;
44 class ThemeServiceGtk; 44 class GtkThemeService;
45 class SkBitmap; 45 class SkBitmap;
46 class ToolbarModel; 46 class ToolbarModel;
47 47
48 namespace content { 48 namespace content {
49 class WebContents; 49 class WebContents;
50 } 50 }
51 51
52 namespace ui { 52 namespace ui {
53 class AcceleratorGtk; 53 class AcceleratorGtk;
54 } 54 }
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 content::PageTransition transition_; 466 content::PageTransition transition_;
467 467
468 // Used to schedule a task for the first run bubble. 468 // Used to schedule a task for the first run bubble.
469 base::WeakPtrFactory<LocationBarViewGtk> weak_ptr_factory_; 469 base::WeakPtrFactory<LocationBarViewGtk> weak_ptr_factory_;
470 470
471 // When true, the location bar view is read only and also is has a slightly 471 // When true, the location bar view is read only and also is has a slightly
472 // different presentation (font size / color). This is used for popups. 472 // different presentation (font size / color). This is used for popups.
473 bool popup_window_mode_; 473 bool popup_window_mode_;
474 474
475 // Provides colors and rendering mode. 475 // Provides colors and rendering mode.
476 ThemeServiceGtk* theme_service_; 476 GtkThemeService* theme_service_;
477 477
478 content::NotificationRegistrar registrar_; 478 content::NotificationRegistrar registrar_;
479 479
480 // Width of the main |hbox_|. Used to properly elide the EV certificate. 480 // Width of the main |hbox_|. Used to properly elide the EV certificate.
481 int hbox_width_; 481 int hbox_width_;
482 482
483 // Width of the hbox that holds |tab_to_search_box_|, |location_entry_| and 483 // Width of the hbox that holds |tab_to_search_box_|, |location_entry_| and
484 // |tab_to_search_hint_|. 484 // |tab_to_search_hint_|.
485 int entry_box_width_; 485 int entry_box_width_;
486 486
487 // Indicate if |tab_to_search_box_| should be shown. 487 // Indicate if |tab_to_search_box_| should be shown.
488 bool show_selected_keyword_; 488 bool show_selected_keyword_;
489 489
490 // Indicate if |tab_to_search_hint_| should be shown. 490 // Indicate if |tab_to_search_hint_| should be shown.
491 bool show_keyword_hint_; 491 bool show_keyword_hint_;
492 492
493 // The last search keyword that was shown via the |tab_to_search_box_|. 493 // The last search keyword that was shown via the |tab_to_search_box_|.
494 string16 last_keyword_; 494 string16 last_keyword_;
495 495
496 // Used to change the visibility of the star decoration. 496 // Used to change the visibility of the star decoration.
497 BooleanPrefMember edit_bookmarks_enabled_; 497 BooleanPrefMember edit_bookmarks_enabled_;
498 498
499 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); 499 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
500 }; 500 };
501 501
502 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 502 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/infobars/infobar_gtk.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698