| 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 virtual void ShowCreateChromeAppShortcutsDialog( | 299 virtual void ShowCreateChromeAppShortcutsDialog( |
| 300 Profile*, const Extension* app) OVERRIDE; | 300 Profile*, const Extension* app) OVERRIDE; |
| 301 virtual void Cut() OVERRIDE; | 301 virtual void Cut() OVERRIDE; |
| 302 virtual void Copy() OVERRIDE; | 302 virtual void Copy() OVERRIDE; |
| 303 virtual void Paste() OVERRIDE; | 303 virtual void Paste() OVERRIDE; |
| 304 virtual void ToggleTabStripMode() OVERRIDE; | 304 virtual void ToggleTabStripMode() OVERRIDE; |
| 305 virtual void PrepareForInstant() OVERRIDE; | 305 virtual void PrepareForInstant() OVERRIDE; |
| 306 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; | 306 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; |
| 307 virtual void HideInstant(bool instant_is_active) OVERRIDE; | 307 virtual void HideInstant(bool instant_is_active) OVERRIDE; |
| 308 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 308 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
| 309 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 310 const gfx::Rect& bounds) OVERRIDE; |
| 309 #if defined(OS_CHROMEOS) | 311 #if defined(OS_CHROMEOS) |
| 310 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE; | 312 virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE; |
| 311 #endif | 313 #endif |
| 312 | 314 |
| 313 // Overridden from BrowserWindowTesting: | 315 // Overridden from BrowserWindowTesting: |
| 314 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; | 316 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; |
| 315 virtual LocationBarView* GetLocationBarView() const OVERRIDE; | 317 virtual LocationBarView* GetLocationBarView() const OVERRIDE; |
| 316 virtual views::View* GetTabContentsContainerView() const OVERRIDE; | 318 virtual views::View* GetTabContentsContainerView() const OVERRIDE; |
| 317 virtual views::View* GetSidebarContainerView() const OVERRIDE; | 319 virtual views::View* GetSidebarContainerView() const OVERRIDE; |
| 318 virtual ToolbarView* GetToolbarView() const OVERRIDE; | 320 virtual ToolbarView* GetToolbarView() const OVERRIDE; |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 | 669 |
| 668 NotificationRegistrar registrar_; | 670 NotificationRegistrar registrar_; |
| 669 | 671 |
| 670 // Used to measure the loading spinner animation rate. | 672 // Used to measure the loading spinner animation rate. |
| 671 base::TimeTicks last_animation_time_; | 673 base::TimeTicks last_animation_time_; |
| 672 | 674 |
| 673 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 675 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 674 }; | 676 }; |
| 675 | 677 |
| 676 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 678 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |