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

Side by Side Diff: chrome/browser/views/frame/browser_view.h

Issue 42490: Experiments with a new tabstrip + animator (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/gfx/native_widget_types.h" 10 #include "base/gfx/native_widget_types.h"
(...skipping 13 matching lines...) Expand all
24 #include "views/controls/menu/simple_menu_model.h" 24 #include "views/controls/menu/simple_menu_model.h"
25 #include "views/window/client_view.h" 25 #include "views/window/client_view.h"
26 #include "views/window/window_delegate.h" 26 #include "views/window/window_delegate.h"
27 27
28 // NOTE: For more information about the objects and files in this directory, 28 // NOTE: For more information about the objects and files in this directory,
29 // view: http://dev.chromium.org/developers/design-documents/browser-window 29 // view: http://dev.chromium.org/developers/design-documents/browser-window
30 30
31 class BookmarkBarView; 31 class BookmarkBarView;
32 class Browser; 32 class Browser;
33 class BrowserBubble; 33 class BrowserBubble;
34 class BrowserTabStrip;
34 class DownloadShelfView; 35 class DownloadShelfView;
35 class EncodingMenuModel; 36 class EncodingMenuModel;
36 class ExtensionShelf; 37 class ExtensionShelf;
37 class FullscreenExitBubble; 38 class FullscreenExitBubble;
38 class HtmlDialogUIDelegate; 39 class HtmlDialogUIDelegate;
39 class InfoBarContainer; 40 class InfoBarContainer;
40 class LocationBarView; 41 class LocationBarView;
41 class StatusBubbleViews; 42 class StatusBubbleViews;
42 class TabContentsContainer; 43 class TabContentsContainer;
43 class TabStrip; 44 class TabStrip;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 // Returns the preferred height of the TabStrip. Used to position the OTR 115 // Returns the preferred height of the TabStrip. Used to position the OTR
115 // avatar icon. 116 // avatar icon.
116 int GetTabStripHeight() const; 117 int GetTabStripHeight() const;
117 118
118 // Returns the bounds of the TabStrip. Used by themed views to determine the 119 // Returns the bounds of the TabStrip. Used by themed views to determine the
119 // offset of IDR_THEME_TOOLBAR. 120 // offset of IDR_THEME_TOOLBAR.
120 gfx::Rect GetTabStripBounds() const; 121 gfx::Rect GetTabStripBounds() const;
121 122
122 // Accessor for the TabStrip. 123 // Accessor for the TabStrip.
123 TabStrip* tabstrip() const { return tabstrip_; } 124 TabStrip* tabstrip() const { return tabstrip_; }
125 BrowserTabStrip* bts() const { return bts_; }
124 126
125 // Accessor for the ExtensionShelf. 127 // Accessor for the ExtensionShelf.
126 ExtensionShelf* extension_shelf() const { return extension_shelf_; } 128 ExtensionShelf* extension_shelf() const { return extension_shelf_; }
127 129
128 // Returns true if various window components are visible. 130 // Returns true if various window components are visible.
129 bool IsToolbarVisible() const; 131 bool IsToolbarVisible() const;
130 bool IsTabStripVisible() const; 132 bool IsTabStripVisible() const;
131 133
132 // Returns true if the profile associated with this Browser window is 134 // Returns true if the profile associated with this Browser window is
133 // off the record. 135 // off the record.
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 virtual void ShowReportBugDialog(); 233 virtual void ShowReportBugDialog();
232 virtual void ShowClearBrowsingDataDialog(); 234 virtual void ShowClearBrowsingDataDialog();
233 virtual void ShowImportDialog(); 235 virtual void ShowImportDialog();
234 virtual void ShowSearchEnginesDialog(); 236 virtual void ShowSearchEnginesDialog();
235 virtual void ShowPasswordManager(); 237 virtual void ShowPasswordManager();
236 virtual void ShowSelectProfileDialog(); 238 virtual void ShowSelectProfileDialog();
237 virtual void ShowNewProfileDialog(); 239 virtual void ShowNewProfileDialog();
238 virtual void ConfirmBrowserCloseWithPendingDownloads(); 240 virtual void ConfirmBrowserCloseWithPendingDownloads();
239 virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate, 241 virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
240 gfx::NativeWindow parent_window); 242 gfx::NativeWindow parent_window);
243 virtual void ContinueDraggingDetachedTab(const gfx::Rect& tab_bounds);
241 virtual void UserChangedTheme(); 244 virtual void UserChangedTheme();
242 virtual int GetExtraRenderViewHeight() const; 245 virtual int GetExtraRenderViewHeight() const;
243 virtual void TabContentsFocused(TabContents* source); 246 virtual void TabContentsFocused(TabContents* source);
244 247
245 // Overridden from BrowserWindowTesting: 248 // Overridden from BrowserWindowTesting:
246 virtual BookmarkBarView* GetBookmarkBarView() const; 249 virtual BookmarkBarView* GetBookmarkBarView() const;
247 virtual LocationBarView* GetLocationBarView() const; 250 virtual LocationBarView* GetLocationBarView() const;
248 virtual views::View* GetTabContentsContainerView() const; 251 virtual views::View* GetTabContentsContainerView() const;
249 252
250 // Overridden from NotificationObserver: 253 // Overridden from NotificationObserver:
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 scoped_ptr<Browser> browser_; 391 scoped_ptr<Browser> browser_;
389 392
390 // Tool/Info bars that we are currently showing. Used for layout. 393 // Tool/Info bars that we are currently showing. Used for layout.
391 // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing, 394 // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing,
392 // or is bookmark_bar_view_ if the bookmark bar is showing. 395 // or is bookmark_bar_view_ if the bookmark bar is showing.
393 views::View* active_bookmark_bar_; 396 views::View* active_bookmark_bar_;
394 397
395 // The TabStrip. 398 // The TabStrip.
396 TabStrip* tabstrip_; 399 TabStrip* tabstrip_;
397 400
401 // The BrowserTabStrip.
402 BrowserTabStrip* bts_;
403
398 // The Toolbar containing the navigation buttons, menus and the address bar. 404 // The Toolbar containing the navigation buttons, menus and the address bar.
399 ToolbarView* toolbar_; 405 ToolbarView* toolbar_;
400 406
401 // The Bookmark Bar View for this window. Lazily created. 407 // The Bookmark Bar View for this window. Lazily created.
402 scoped_ptr<BookmarkBarView> bookmark_bar_view_; 408 scoped_ptr<BookmarkBarView> bookmark_bar_view_;
403 409
404 // The download shelf view (view at the bottom of the page). 410 // The download shelf view (view at the bottom of the page).
405 scoped_ptr<DownloadShelfView> download_shelf_; 411 scoped_ptr<DownloadShelfView> download_shelf_;
406 412
407 // The InfoBarContainer that contains InfoBars for the current tab. 413 // The InfoBarContainer that contains InfoBars for the current tab.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 // A bottom bar for showing extensions. 474 // A bottom bar for showing extensions.
469 ExtensionShelf* extension_shelf_; 475 ExtensionShelf* extension_shelf_;
470 476
471 typedef std::set<BrowserBubble*> BubbleSet; 477 typedef std::set<BrowserBubble*> BubbleSet;
472 BubbleSet browser_bubbles_; 478 BubbleSet browser_bubbles_;
473 479
474 DISALLOW_COPY_AND_ASSIGN(BrowserView); 480 DISALLOW_COPY_AND_ASSIGN(BrowserView);
475 }; 481 };
476 482
477 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 483 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/frame/browser_frame_win.cc ('k') | chrome/browser/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698