| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 #endif | 342 #endif |
| 343 | 343 |
| 344 // Overridden from BrowserWindowTesting: | 344 // Overridden from BrowserWindowTesting: |
| 345 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; | 345 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; |
| 346 virtual LocationBarView* GetLocationBarView() const OVERRIDE; | 346 virtual LocationBarView* GetLocationBarView() const OVERRIDE; |
| 347 virtual views::View* GetTabContentsContainerView() const OVERRIDE; | 347 virtual views::View* GetTabContentsContainerView() const OVERRIDE; |
| 348 virtual views::View* GetSidebarContainerView() const OVERRIDE; | 348 virtual views::View* GetSidebarContainerView() const OVERRIDE; |
| 349 virtual ToolbarView* GetToolbarView() const OVERRIDE; | 349 virtual ToolbarView* GetToolbarView() const OVERRIDE; |
| 350 | 350 |
| 351 // Overridden from NotificationObserver: | 351 // Overridden from NotificationObserver: |
| 352 virtual void Observe(NotificationType type, | 352 virtual void Observe(int type, |
| 353 const NotificationSource& source, | 353 const NotificationSource& source, |
| 354 const NotificationDetails& details) OVERRIDE; | 354 const NotificationDetails& details) OVERRIDE; |
| 355 | 355 |
| 356 // Overridden from TabStripModelObserver: | 356 // Overridden from TabStripModelObserver: |
| 357 virtual void TabDetachedAt(TabContentsWrapper* contents, int index) OVERRIDE; | 357 virtual void TabDetachedAt(TabContentsWrapper* contents, int index) OVERRIDE; |
| 358 virtual void TabDeactivated(TabContentsWrapper* contents) OVERRIDE; | 358 virtual void TabDeactivated(TabContentsWrapper* contents) OVERRIDE; |
| 359 virtual void ActiveTabChanged(TabContentsWrapper* old_contents, | 359 virtual void ActiveTabChanged(TabContentsWrapper* old_contents, |
| 360 TabContentsWrapper* new_contents, | 360 TabContentsWrapper* new_contents, |
| 361 int index, | 361 int index, |
| 362 bool user_gesture) OVERRIDE; | 362 bool user_gesture) OVERRIDE; |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 | 723 |
| 724 NotificationRegistrar registrar_; | 724 NotificationRegistrar registrar_; |
| 725 | 725 |
| 726 // Used to measure the loading spinner animation rate. | 726 // Used to measure the loading spinner animation rate. |
| 727 base::TimeTicks last_animation_time_; | 727 base::TimeTicks last_animation_time_; |
| 728 | 728 |
| 729 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 729 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 730 }; | 730 }; |
| 731 | 731 |
| 732 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 732 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |