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

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

Issue 6812037: GTK: A first *very* rough cut at a global menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment Created 9 years, 8 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) 2011 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_BROWSER_WINDOW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "ui/gfx/rect.h" 24 #include "ui/gfx/rect.h"
25 25
26 class BookmarkBarGtk; 26 class BookmarkBarGtk;
27 class Browser; 27 class Browser;
28 class BrowserTitlebar; 28 class BrowserTitlebar;
29 class BrowserToolbarGtk; 29 class BrowserToolbarGtk;
30 class CustomDrawButton; 30 class CustomDrawButton;
31 class DownloadShelfGtk; 31 class DownloadShelfGtk;
32 class FindBarGtk; 32 class FindBarGtk;
33 class FullscreenExitBubbleGtk; 33 class FullscreenExitBubbleGtk;
34 class GlobalMenuBar;
34 class InfoBarContainerGtk; 35 class InfoBarContainerGtk;
35 class LocationBar; 36 class LocationBar;
36 class StatusBubbleGtk; 37 class StatusBubbleGtk;
37 class TabContentsContainerGtk; 38 class TabContentsContainerGtk;
38 class TabStripGtk; 39 class TabStripGtk;
39 40
40 // An implementation of BrowserWindow for GTK. 41 // An implementation of BrowserWindow for GTK.
41 // Cross-platform code will interact with this object when 42 // Cross-platform code will interact with this object when
42 // it needs to manipulate the window. 43 // it needs to manipulate the window.
43 44
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 NotificationRegistrar registrar_; 418 NotificationRegistrar registrar_;
418 419
419 // The position and size of the current window. 420 // The position and size of the current window.
420 gfx::Rect bounds_; 421 gfx::Rect bounds_;
421 422
422 // The position and size of the non-maximized, non-fullscreen window. 423 // The position and size of the non-maximized, non-fullscreen window.
423 gfx::Rect restored_bounds_; 424 gfx::Rect restored_bounds_;
424 425
425 GdkWindowState state_; 426 GdkWindowState state_;
426 427
428 // Controls a hidden GtkMenuBar that we keep updated so GNOME can take a look
429 // inside "our menu bar" and present it in the top panel, akin to Mac OS.
430 scoped_ptr<GlobalMenuBar> global_menu_bar_;
431
427 // The container for the titlebar + tab strip. 432 // The container for the titlebar + tab strip.
428 scoped_ptr<BrowserTitlebar> titlebar_; 433 scoped_ptr<BrowserTitlebar> titlebar_;
429 434
430 // The object that manages all of the widgets in the toolbar. 435 // The object that manages all of the widgets in the toolbar.
431 scoped_ptr<BrowserToolbarGtk> toolbar_; 436 scoped_ptr<BrowserToolbarGtk> toolbar_;
432 437
433 // The object that manages the bookmark bar. This will be NULL if the 438 // The object that manages the bookmark bar. This will be NULL if the
434 // bookmark bar is not supported. 439 // bookmark bar is not supported.
435 scoped_ptr<BookmarkBarGtk> bookmark_bar_; 440 scoped_ptr<BookmarkBarGtk> bookmark_bar_;
436 441
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_; 505 scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_;
501 506
502 // The model that tracks the paint state of the arrow for the infobar 507 // The model that tracks the paint state of the arrow for the infobar
503 // directly below the toolbar. 508 // directly below the toolbar.
504 InfoBarArrowModel infobar_arrow_model_; 509 InfoBarArrowModel infobar_arrow_model_;
505 510
506 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk); 511 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);
507 }; 512 };
508 513
509 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_ 514 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698