| 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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 virtual void Cut() OVERRIDE; | 311 virtual void Cut() OVERRIDE; |
| 312 virtual void Copy() OVERRIDE; | 312 virtual void Copy() OVERRIDE; |
| 313 virtual void Paste() OVERRIDE; | 313 virtual void Paste() OVERRIDE; |
| 314 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; | 314 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; |
| 315 virtual void HideInstant(bool instant_is_active) OVERRIDE; | 315 virtual void HideInstant(bool instant_is_active) OVERRIDE; |
| 316 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 316 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
| 317 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 317 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 318 const gfx::Rect& bounds) OVERRIDE; | 318 const gfx::Rect& bounds) OVERRIDE; |
| 319 virtual FindBar* CreateFindBar() OVERRIDE; | 319 virtual FindBar* CreateFindBar() OVERRIDE; |
| 320 #if defined(OS_CHROMEOS) | 320 #if defined(OS_CHROMEOS) |
| 321 virtual void ShowMobileSetup() OVERRIDE; |
| 321 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE; | 322 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE; |
| 322 #endif | 323 #endif |
| 323 virtual void ShowAvatarBubble(TabContents* tab_contents, | 324 virtual void ShowAvatarBubble(TabContents* tab_contents, |
| 324 const gfx::Rect& rect) OVERRIDE; | 325 const gfx::Rect& rect) OVERRIDE; |
| 325 | 326 |
| 326 // Overridden from BrowserWindowTesting: | 327 // Overridden from BrowserWindowTesting: |
| 327 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; | 328 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; |
| 328 virtual LocationBarView* GetLocationBarView() const OVERRIDE; | 329 virtual LocationBarView* GetLocationBarView() const OVERRIDE; |
| 329 virtual views::View* GetTabContentsContainerView() const OVERRIDE; | 330 virtual views::View* GetTabContentsContainerView() const OVERRIDE; |
| 330 virtual views::View* GetSidebarContainerView() const OVERRIDE; | 331 virtual views::View* GetSidebarContainerView() const OVERRIDE; |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 base::TimeTicks last_animation_time_; | 692 base::TimeTicks last_animation_time_; |
| 692 | 693 |
| 693 // If this flag is set then SetFocusToLocationBar() will set focus to the | 694 // If this flag is set then SetFocusToLocationBar() will set focus to the |
| 694 // location bar even if the browser window is not active. | 695 // location bar even if the browser window is not active. |
| 695 bool force_location_bar_focus_; | 696 bool force_location_bar_focus_; |
| 696 | 697 |
| 697 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 698 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 698 }; | 699 }; |
| 699 | 700 |
| 700 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 701 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |