| 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 virtual void PrepareForInstant() OVERRIDE; | 323 virtual void PrepareForInstant() OVERRIDE; |
| 324 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; | 324 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; |
| 325 virtual void HideInstant(bool instant_is_active) OVERRIDE; | 325 virtual void HideInstant(bool instant_is_active) OVERRIDE; |
| 326 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 326 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
| 327 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 327 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 328 const gfx::Rect& bounds) OVERRIDE; | 328 const gfx::Rect& bounds) OVERRIDE; |
| 329 virtual FindBar* CreateFindBar() OVERRIDE; | 329 virtual FindBar* CreateFindBar() OVERRIDE; |
| 330 #if defined(OS_CHROMEOS) | 330 #if defined(OS_CHROMEOS) |
| 331 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE; | 331 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE; |
| 332 #endif | 332 #endif |
| 333 virtual void ShowAvatarBubble(TabContents* tab_contents, |
| 334 int x, int y) OVERRIDE; |
| 333 | 335 |
| 334 // Overridden from BrowserWindowTesting: | 336 // Overridden from BrowserWindowTesting: |
| 335 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; | 337 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; |
| 336 virtual LocationBarView* GetLocationBarView() const OVERRIDE; | 338 virtual LocationBarView* GetLocationBarView() const OVERRIDE; |
| 337 virtual views::View* GetTabContentsContainerView() const OVERRIDE; | 339 virtual views::View* GetTabContentsContainerView() const OVERRIDE; |
| 338 virtual views::View* GetSidebarContainerView() const OVERRIDE; | 340 virtual views::View* GetSidebarContainerView() const OVERRIDE; |
| 339 virtual ToolbarView* GetToolbarView() const OVERRIDE; | 341 virtual ToolbarView* GetToolbarView() const OVERRIDE; |
| 340 | 342 |
| 341 // Overridden from NotificationObserver: | 343 // Overridden from NotificationObserver: |
| 342 virtual void Observe(int type, | 344 virtual void Observe(int type, |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 704 base::TimeTicks last_animation_time_; | 706 base::TimeTicks last_animation_time_; |
| 705 | 707 |
| 706 // If this flag is set then SetFocusToLocationBar() will set focus to the | 708 // If this flag is set then SetFocusToLocationBar() will set focus to the |
| 707 // location bar even if the browser window is not active. | 709 // location bar even if the browser window is not active. |
| 708 bool force_location_bar_focus_; | 710 bool force_location_bar_focus_; |
| 709 | 711 |
| 710 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 712 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 711 }; | 713 }; |
| 712 | 714 |
| 713 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 715 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |