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

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

Issue 240193003: Move Infobars core files to the Infobars component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nib name on mac Created 6 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) 2012 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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/timer/timer.h" 14 #include "base/timer/timer.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/devtools/devtools_window.h" 16 #include "chrome/browser/devtools/devtools_window.h"
17 #include "chrome/browser/infobars/infobar_container.h"
18 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_window.h" 18 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" 19 #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h"
21 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 20 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
22 #include "chrome/browser/ui/views/frame/browser_frame.h" 21 #include "chrome/browser/ui/views/frame/browser_frame.h"
23 #include "chrome/browser/ui/views/frame/contents_web_view.h" 22 #include "chrome/browser/ui/views/frame/contents_web_view.h"
24 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 23 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
25 #include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h" 24 #include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h"
26 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" 25 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
27 #include "chrome/browser/ui/views/load_complete_listener.h" 26 #include "chrome/browser/ui/views/load_complete_listener.h"
27 #include "components/infobars/core/infobar_container.h"
28 #include "ui/base/accelerators/accelerator.h" 28 #include "ui/base/accelerators/accelerator.h"
29 #include "ui/base/models/simple_menu_model.h" 29 #include "ui/base/models/simple_menu_model.h"
30 #include "ui/gfx/native_widget_types.h" 30 #include "ui/gfx/native_widget_types.h"
31 #include "ui/gfx/sys_color_change_listener.h" 31 #include "ui/gfx/sys_color_change_listener.h"
32 #include "ui/views/controls/button/button.h" 32 #include "ui/views/controls/button/button.h"
33 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" 33 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
34 #include "ui/views/widget/widget_delegate.h" 34 #include "ui/views/widget/widget_delegate.h"
35 #include "ui/views/widget/widget_observer.h" 35 #include "ui/views/widget/widget_observer.h"
36 #include "ui/views/window/client_view.h" 36 #include "ui/views/window/client_view.h"
37 37
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 // A ClientView subclass that provides the contents of a browser window, 88 // A ClientView subclass that provides the contents of a browser window,
89 // including the TabStrip, toolbars, download shelves, the content area etc. 89 // including the TabStrip, toolbars, download shelves, the content area etc.
90 // 90 //
91 class BrowserView : public BrowserWindow, 91 class BrowserView : public BrowserWindow,
92 public BrowserWindowTesting, 92 public BrowserWindowTesting,
93 public TabStripModelObserver, 93 public TabStripModelObserver,
94 public ui::AcceleratorProvider, 94 public ui::AcceleratorProvider,
95 public views::WidgetDelegate, 95 public views::WidgetDelegate,
96 public views::WidgetObserver, 96 public views::WidgetObserver,
97 public views::ClientView, 97 public views::ClientView,
98 public InfoBarContainer::Delegate, 98 public infobars::InfoBarContainer::Delegate,
99 public gfx::SysColorChangeListener, 99 public gfx::SysColorChangeListener,
100 public LoadCompleteListener::Delegate, 100 public LoadCompleteListener::Delegate,
101 public OmniboxPopupModelObserver { 101 public OmniboxPopupModelObserver {
102 public: 102 public:
103 // The browser view's class name. 103 // The browser view's class name.
104 static const char kViewClassName[]; 104 static const char kViewClassName[];
105 105
106 BrowserView(); 106 BrowserView();
107 virtual ~BrowserView(); 107 virtual ~BrowserView();
108 108
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 gfx::ScopedSysColorChangeListener color_change_listener_; 746 gfx::ScopedSysColorChangeListener color_change_listener_;
747 747
748 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 748 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
749 749
750 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 750 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
751 751
752 DISALLOW_COPY_AND_ASSIGN(BrowserView); 752 DISALLOW_COPY_AND_ASSIGN(BrowserView);
753 }; 753 };
754 754
755 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 755 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698