| 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 const content::PasswordForm& form, | 346 const content::PasswordForm& form, |
| 347 autofill::PasswordGenerator* password_generator) OVERRIDE; | 347 autofill::PasswordGenerator* password_generator) OVERRIDE; |
| 348 | 348 |
| 349 // Overridden from BrowserWindowTesting: | 349 // Overridden from BrowserWindowTesting: |
| 350 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; | 350 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; |
| 351 virtual LocationBarView* GetLocationBarView() const OVERRIDE; | 351 virtual LocationBarView* GetLocationBarView() const OVERRIDE; |
| 352 virtual views::View* GetTabContentsContainerView() const OVERRIDE; | 352 virtual views::View* GetTabContentsContainerView() const OVERRIDE; |
| 353 virtual ToolbarView* GetToolbarView() const OVERRIDE; | 353 virtual ToolbarView* GetToolbarView() const OVERRIDE; |
| 354 | 354 |
| 355 // Overridden from TabStripModelObserver: | 355 // Overridden from TabStripModelObserver: |
| 356 virtual void TabInsertedAt(TabContents* contents, |
| 357 int index, |
| 358 bool active) OVERRIDE; |
| 356 virtual void TabDetachedAt(TabContents* contents, int index) OVERRIDE; | 359 virtual void TabDetachedAt(TabContents* contents, int index) OVERRIDE; |
| 357 virtual void TabDeactivated(TabContents* contents) OVERRIDE; | 360 virtual void TabDeactivated(TabContents* contents) OVERRIDE; |
| 358 virtual void ActiveTabChanged(TabContents* old_contents, | 361 virtual void ActiveTabChanged(TabContents* old_contents, |
| 359 TabContents* new_contents, | 362 TabContents* new_contents, |
| 360 int index, | 363 int index, |
| 361 bool user_gesture) OVERRIDE; | 364 bool user_gesture) OVERRIDE; |
| 362 virtual void TabReplacedAt(TabStripModel* tab_strip_model, | 365 virtual void TabReplacedAt(TabStripModel* tab_strip_model, |
| 363 TabContents* old_contents, | 366 TabContents* old_contents, |
| 364 TabContents* new_contents, | 367 TabContents* new_contents, |
| 365 int index) OVERRIDE; | 368 int index) OVERRIDE; |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 #endif | 730 #endif |
| 728 | 731 |
| 729 scoped_ptr<InstantPreviewControllerViews> preview_controller_; | 732 scoped_ptr<InstantPreviewControllerViews> preview_controller_; |
| 730 | 733 |
| 731 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 734 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 732 | 735 |
| 733 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 736 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 734 }; | 737 }; |
| 735 | 738 |
| 736 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 739 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |