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

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

Issue 8607002: gtk: Move DownloadShelfGtk data member to private section of BrowserWindowGtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 // Floating container that holds the render area. It is needed to position 285 // Floating container that holds the render area. It is needed to position
286 // the findbar. 286 // the findbar.
287 GtkWidget* render_area_floating_container_; 287 GtkWidget* render_area_floating_container_;
288 // EventBox that holds render_area_floating_container_. 288 // EventBox that holds render_area_floating_container_.
289 GtkWidget* render_area_event_box_; 289 GtkWidget* render_area_event_box_;
290 // Border between toolbar and render area. 290 // Border between toolbar and render area.
291 GtkWidget* toolbar_border_; 291 GtkWidget* toolbar_border_;
292 292
293 scoped_ptr<Browser> browser_; 293 scoped_ptr<Browser> browser_;
294 294
295 // The download shelf view (view at the bottom of the page).
296 scoped_ptr<DownloadShelfGtk> download_shelf_;
297
298 private: 295 private:
299 // Show or hide the bookmark bar. 296 // Show or hide the bookmark bar.
300 void MaybeShowBookmarkBar(bool animate); 297 void MaybeShowBookmarkBar(bool animate);
301 298
302 // Connect to signals on |window_|. 299 // Connect to signals on |window_|.
303 void ConnectHandlersToSignals(); 300 void ConnectHandlersToSignals();
304 301
305 // Create the various UI components. 302 // Create the various UI components.
306 void InitWidgets(); 303 void InitWidgets();
307 304
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 // The container for the titlebar + tab strip. 447 // The container for the titlebar + tab strip.
451 scoped_ptr<BrowserTitlebar> titlebar_; 448 scoped_ptr<BrowserTitlebar> titlebar_;
452 449
453 // The object that manages all of the widgets in the toolbar. 450 // The object that manages all of the widgets in the toolbar.
454 scoped_ptr<BrowserToolbarGtk> toolbar_; 451 scoped_ptr<BrowserToolbarGtk> toolbar_;
455 452
456 // The object that manages the bookmark bar. This will be NULL if the 453 // The object that manages the bookmark bar. This will be NULL if the
457 // bookmark bar is not supported. 454 // bookmark bar is not supported.
458 scoped_ptr<BookmarkBarGtk> bookmark_bar_; 455 scoped_ptr<BookmarkBarGtk> bookmark_bar_;
459 456
457 // The download shelf view (view at the bottom of the page).
458 scoped_ptr<DownloadShelfGtk> download_shelf_;
459
460 // The status bubble manager. Always non-NULL. 460 // The status bubble manager. Always non-NULL.
461 scoped_ptr<StatusBubbleGtk> status_bubble_; 461 scoped_ptr<StatusBubbleGtk> status_bubble_;
462 462
463 // A container that manages the GtkWidget*s that are the webpage display 463 // A container that manages the GtkWidget*s that are the webpage display
464 // (along with associated infobars, shelves, and other things that are part 464 // (along with associated infobars, shelves, and other things that are part
465 // of the content area). 465 // of the content area).
466 scoped_ptr<TabContentsContainerGtk> contents_container_; 466 scoped_ptr<TabContentsContainerGtk> contents_container_;
467 467
468 // A container that manages the GtkWidget*s of developer tools for the 468 // A container that manages the GtkWidget*s of developer tools for the
469 // selected tab contents. 469 // selected tab contents.
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 // be called. This should only be enabled in tests where the debounce timeout 521 // be called. This should only be enabled in tests where the debounce timeout
522 // introduces timing issues (e.g. in OmniBoxApiTest it dismisses the 522 // introduces timing issues (e.g. in OmniBoxApiTest it dismisses the
523 // autocomplete popup before the results can be read) and the final window 523 // autocomplete popup before the results can be read) and the final window
524 // position is unimportant. 524 // position is unimportant.
525 bool debounce_timer_disabled_; 525 bool debounce_timer_disabled_;
526 526
527 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk); 527 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);
528 }; 528 };
529 529
530 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_ 530 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698