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

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

Issue 11318: Beginnings of a new InfoBar system. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 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 | « chrome/browser/views/browser_views.vcproj ('k') | chrome/browser/views/frame/browser_view.cc » ('j') | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "chrome/browser/browser.h" 8 #include "chrome/browser/browser.h"
9 #include "chrome/browser/browser_window.h" 9 #include "chrome/browser/browser_window.h"
10 #include "chrome/browser/hang_monitor/hung_plugin_action.h" 10 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
11 #include "chrome/browser/hang_monitor/hung_window_detector.h" 11 #include "chrome/browser/hang_monitor/hung_window_detector.h"
12 #include "chrome/browser/tabs/tab_strip_model.h" 12 #include "chrome/browser/tabs/tab_strip_model.h"
13 #include "chrome/browser/views/frame/browser_frame.h" 13 #include "chrome/browser/views/frame/browser_frame.h"
14 #include "chrome/common/pref_member.h" 14 #include "chrome/common/pref_member.h"
15 #include "chrome/views/client_view.h" 15 #include "chrome/views/client_view.h"
16 #include "chrome/views/window_delegate.h" 16 #include "chrome/views/window_delegate.h"
17 17
18 // NOTE: For more information about the objects and files in this directory, 18 // NOTE: For more information about the objects and files in this directory,
19 // view: https://sites.google.com/a/google.com/the-chrome-project/develope rs/design-documents/browser-window 19 // view: https://sites.google.com/a/google.com/the-chrome-project/develope rs/design-documents/browser-window
20 20
21 class BookmarkBarView; 21 class BookmarkBarView;
22 class Browser; 22 class Browser;
23 class BrowserToolbarView; 23 class BrowserToolbarView;
24 class EncodingMenuControllerDelegate; 24 class EncodingMenuControllerDelegate;
25 class InfoBarContainer;
25 class Menu; 26 class Menu;
26 class StatusBubble; 27 class StatusBubble;
27 class TabContentsContainerView; 28 class TabContentsContainerView;
28 29
29 /////////////////////////////////////////////////////////////////////////////// 30 ///////////////////////////////////////////////////////////////////////////////
30 // BrowserView 31 // BrowserView
31 // 32 //
32 // A ClientView subclass that provides the contents of a browser window, 33 // A ClientView subclass that provides the contents of a browser window,
33 // including the TabStrip, toolbars, download shelves, the content area etc. 34 // including the TabStrip, toolbars, download shelves, the content area etc.
34 // 35 //
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 337
337 // The TabStrip. 338 // The TabStrip.
338 TabStrip* tabstrip_; 339 TabStrip* tabstrip_;
339 340
340 // The Toolbar containing the navigation buttons, menus and the address bar. 341 // The Toolbar containing the navigation buttons, menus and the address bar.
341 BrowserToolbarView* toolbar_; 342 BrowserToolbarView* toolbar_;
342 343
343 // The Bookmark Bar View for this window. Lazily created. 344 // The Bookmark Bar View for this window. Lazily created.
344 scoped_ptr<BookmarkBarView> bookmark_bar_view_; 345 scoped_ptr<BookmarkBarView> bookmark_bar_view_;
345 346
347 // The InfoBarContainer that contains InfoBars for the current tab.
348 InfoBarContainer* infobar_container_;
349
346 // The view that contains the selected TabContents. 350 // The view that contains the selected TabContents.
347 TabContentsContainerView* contents_container_; 351 TabContentsContainerView* contents_container_;
348 352
349 // The Status information bubble that appears at the bottom of the window. 353 // The Status information bubble that appears at the bottom of the window.
350 scoped_ptr<StatusBubble> status_bubble_; 354 scoped_ptr<StatusBubble> status_bubble_;
351 355
352 // A mapping between accelerators and commands. 356 // A mapping between accelerators and commands.
353 scoped_ptr<std::map<views::Accelerator, int>> accelerator_table_; 357 scoped_ptr<std::map<views::Accelerator, int>> accelerator_table_;
354 358
355 // A PrefMember to track the "always show bookmark bar" pref. 359 // A PrefMember to track the "always show bookmark bar" pref.
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 // P13N stuff 404 // P13N stuff
401 #ifdef CHROME_PERSONALIZATION 405 #ifdef CHROME_PERSONALIZATION
402 FramePersonalization personalization_; 406 FramePersonalization personalization_;
403 bool personalization_enabled_; 407 bool personalization_enabled_;
404 #endif 408 #endif
405 409
406 DISALLOW_EVIL_CONSTRUCTORS(BrowserView); 410 DISALLOW_EVIL_CONSTRUCTORS(BrowserView);
407 }; 411 };
408 412
409 #endif // #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 413 #endif // #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/browser_views.vcproj ('k') | chrome/browser/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698