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

Side by Side Diff: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h

Issue 9447096: gtk: Rename GtkThemeService to ThemeServiceGtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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) 2011 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_BOOKMARKS_BOOKMARK_BAR_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
11 #include <vector> 11 #include <vector>
(...skipping 15 matching lines...) Expand all
27 #include "ui/base/animation/animation_delegate.h" 27 #include "ui/base/animation/animation_delegate.h"
28 #include "ui/base/animation/slide_animation.h" 28 #include "ui/base/animation/slide_animation.h"
29 #include "ui/base/gtk/gtk_signal.h" 29 #include "ui/base/gtk/gtk_signal.h"
30 #include "ui/base/gtk/owned_widget_gtk.h" 30 #include "ui/base/gtk/owned_widget_gtk.h"
31 #include "ui/gfx/point.h" 31 #include "ui/gfx/point.h"
32 #include "ui/gfx/size.h" 32 #include "ui/gfx/size.h"
33 33
34 class BookmarkMenuController; 34 class BookmarkMenuController;
35 class Browser; 35 class Browser;
36 class BrowserWindowGtk; 36 class BrowserWindowGtk;
37 class GtkThemeService; 37 class ThemeServiceGtk;
38 class MenuGtk; 38 class MenuGtk;
39 class TabstripOriginProvider; 39 class TabstripOriginProvider;
40 40
41 namespace content { 41 namespace content {
42 class PageNavigator; 42 class PageNavigator;
43 } 43 }
44 44
45 class BookmarkBarGtk : public ui::AnimationDelegate, 45 class BookmarkBarGtk : public ui::AnimationDelegate,
46 public BookmarkModelObserver, 46 public BookmarkModelObserver,
47 public MenuBarHelper::Delegate, 47 public MenuBarHelper::Delegate,
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 // dragging. 354 // dragging.
355 const BookmarkNode* dragged_node_; 355 const BookmarkNode* dragged_node_;
356 356
357 // The visual representation that follows the cursor during drags. 357 // The visual representation that follows the cursor during drags.
358 GtkWidget* drag_icon_; 358 GtkWidget* drag_icon_;
359 359
360 // We create a GtkToolbarItem from |dragged_node_| ;or display. 360 // We create a GtkToolbarItem from |dragged_node_| ;or display.
361 GtkToolItem* toolbar_drop_item_; 361 GtkToolItem* toolbar_drop_item_;
362 362
363 // Theme provider for building buttons. 363 // Theme provider for building buttons.
364 GtkThemeService* theme_service_; 364 ThemeServiceGtk* theme_service_;
365 365
366 // Whether we should show the instructional text in the bookmark bar. 366 // Whether we should show the instructional text in the bookmark bar.
367 bool show_instructions_; 367 bool show_instructions_;
368 368
369 MenuBarHelper menu_bar_helper_; 369 MenuBarHelper menu_bar_helper_;
370 370
371 // The last displayed right click menu, or NULL if no menus have been 371 // The last displayed right click menu, or NULL if no menus have been
372 // displayed yet. 372 // displayed yet.
373 // The controller. 373 // The controller.
374 scoped_ptr<BookmarkContextMenuController> current_context_menu_controller_; 374 scoped_ptr<BookmarkContextMenuController> current_context_menu_controller_;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 406
407 BookmarkBar::State bookmark_bar_state_; 407 BookmarkBar::State bookmark_bar_state_;
408 408
409 // Maximum height of the bookmark bar. 409 // Maximum height of the bookmark bar.
410 int max_height_; 410 int max_height_;
411 411
412 DISALLOW_COPY_AND_ASSIGN(BookmarkBarGtk); 412 DISALLOW_COPY_AND_ASSIGN(BookmarkBarGtk);
413 }; 413 };
414 414
415 #endif // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_ 415 #endif // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/back_forward_button_gtk.cc ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698