OLD | NEW |
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> |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 autofill::PasswordGenerator* password_generator) OVERRIDE; | 372 autofill::PasswordGenerator* password_generator) OVERRIDE; |
373 | 373 |
374 // Overridden from BrowserWindowTesting: | 374 // Overridden from BrowserWindowTesting: |
375 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; | 375 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; |
376 virtual LocationBarView* GetLocationBarView() const OVERRIDE; | 376 virtual LocationBarView* GetLocationBarView() const OVERRIDE; |
377 virtual views::View* GetTabContentsContainerView() const OVERRIDE; | 377 virtual views::View* GetTabContentsContainerView() const OVERRIDE; |
378 virtual ToolbarView* GetToolbarView() const OVERRIDE; | 378 virtual ToolbarView* GetToolbarView() const OVERRIDE; |
379 | 379 |
380 // Overridden from TabStripModelObserver: | 380 // Overridden from TabStripModelObserver: |
381 virtual void TabDetachedAt(content::WebContents* contents, | 381 virtual void TabDetachedAt(content::WebContents* contents, |
382 int index) OVERRIDE; | 382 int index, |
| 383 bool closing_all) OVERRIDE; |
383 virtual void TabDeactivated(content::WebContents* contents) OVERRIDE; | 384 virtual void TabDeactivated(content::WebContents* contents) OVERRIDE; |
384 virtual void ActiveTabChanged(content::WebContents* old_contents, | 385 virtual void ActiveTabChanged(content::WebContents* old_contents, |
385 content::WebContents* new_contents, | 386 content::WebContents* new_contents, |
386 int index, | 387 int index, |
387 int reason) OVERRIDE; | 388 int reason) OVERRIDE; |
388 virtual void TabStripEmpty() OVERRIDE; | 389 virtual void TabStripEmpty() OVERRIDE; |
389 | 390 |
390 // Overridden from ui::AcceleratorProvider: | 391 // Overridden from ui::AcceleratorProvider: |
391 virtual bool GetAcceleratorForCommandId(int command_id, | 392 virtual bool GetAcceleratorForCommandId(int command_id, |
392 ui::Accelerator* accelerator) OVERRIDE; | 393 ui::Accelerator* accelerator) OVERRIDE; |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
773 gfx::ScopedSysColorChangeListener color_change_listener_; | 774 gfx::ScopedSysColorChangeListener color_change_listener_; |
774 | 775 |
775 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; | 776 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; |
776 | 777 |
777 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 778 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
778 | 779 |
779 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 780 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
780 }; | 781 }; |
781 | 782 |
782 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 783 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |