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

Side by Side Diff: chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h

Issue 9447096: gtk: Rename GtkThemeService to ThemeServiceGtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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_OMNIBOX_OMNIBOX_VIEW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 26 matching lines...) Expand all
37 37
38 namespace ui { 38 namespace ui {
39 class MultiAnimation; 39 class MultiAnimation;
40 } 40 }
41 41
42 namespace views { 42 namespace views {
43 class View; 43 class View;
44 } 44 }
45 45
46 #if !defined(TOOLKIT_VIEWS) 46 #if !defined(TOOLKIT_VIEWS)
47 class GtkThemeService; 47 class ThemeServiceGtk;
48 #endif 48 #endif
49 49
50 class OmniboxViewGtk : public OmniboxView, 50 class OmniboxViewGtk : public OmniboxView,
51 public content::NotificationObserver, 51 public content::NotificationObserver,
52 public ui::AnimationDelegate { 52 public ui::AnimationDelegate {
53 public: 53 public:
54 // Modeled like the Windows CHARRANGE. Represent a pair of cursor position 54 // Modeled like the Windows CHARRANGE. Represent a pair of cursor position
55 // offsets. Since GtkTextIters are invalid after the buffer is changed, we 55 // offsets. Since GtkTextIters are invalid after the buffer is changed, we
56 // work in character offsets (not bytes). 56 // work in character offsets (not bytes).
57 struct CharRange { 57 struct CharRange {
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 // Was the text view already focused before the user clicked in it? We use 436 // Was the text view already focused before the user clicked in it? We use
437 // this to figure out whether we should select all of the text when the button 437 // this to figure out whether we should select all of the text when the button
438 // is released (we only do so if the view was initially unfocused). 438 // is released (we only do so if the view was initially unfocused).
439 bool text_view_focused_before_button_press_; 439 bool text_view_focused_before_button_press_;
440 #endif 440 #endif
441 441
442 #if defined(TOOLKIT_VIEWS) 442 #if defined(TOOLKIT_VIEWS)
443 views::View* location_bar_view_; 443 views::View* location_bar_view_;
444 #else 444 #else
445 // Supplies colors, et cetera. 445 // Supplies colors, et cetera.
446 GtkThemeService* theme_service_; 446 ThemeServiceGtk* theme_service_;
447 447
448 content::NotificationRegistrar registrar_; 448 content::NotificationRegistrar registrar_;
449 #endif 449 #endif
450 450
451 // Indicates if Enter key was pressed. 451 // Indicates if Enter key was pressed.
452 // 452 //
453 // It's used in the key press handler to detect an Enter key press event 453 // It's used in the key press handler to detect an Enter key press event
454 // during sync dispatch of "end-user-action" signal so that an unexpected 454 // during sync dispatch of "end-user-action" signal so that an unexpected
455 // change caused by the event can be ignored in OnAfterPossibleChange(). 455 // change caused by the event can be ignored in OnAfterPossibleChange().
456 bool enter_was_pressed_; 456 bool enter_was_pressed_;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 // The view that is going to be focused next. Only valid while handling 520 // The view that is going to be focused next. Only valid while handling
521 // "focus-out" events. 521 // "focus-out" events.
522 GtkWidget* going_to_focus_; 522 GtkWidget* going_to_focus_;
523 523
524 ui::GtkSignalRegistrar signals_; 524 ui::GtkSignalRegistrar signals_;
525 525
526 DISALLOW_COPY_AND_ASSIGN(OmniboxViewGtk); 526 DISALLOW_COPY_AND_ASSIGN(OmniboxViewGtk);
527 }; 527 };
528 528
529 #endif // CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_ 529 #endif // CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc ('k') | chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698