| 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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 virtual bool PreHandleKeyboardEvent( | 329 virtual bool PreHandleKeyboardEvent( |
| 330 const content::NativeWebKeyboardEvent& event, | 330 const content::NativeWebKeyboardEvent& event, |
| 331 bool* is_keyboard_shortcut) OVERRIDE; | 331 bool* is_keyboard_shortcut) OVERRIDE; |
| 332 virtual void HandleKeyboardEvent( | 332 virtual void HandleKeyboardEvent( |
| 333 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 333 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
| 334 virtual void ShowCreateChromeAppShortcutsDialog( | 334 virtual void ShowCreateChromeAppShortcutsDialog( |
| 335 Profile*, const extensions::Extension* app) OVERRIDE; | 335 Profile*, const extensions::Extension* app) OVERRIDE; |
| 336 virtual void Cut() OVERRIDE; | 336 virtual void Cut() OVERRIDE; |
| 337 virtual void Copy() OVERRIDE; | 337 virtual void Copy() OVERRIDE; |
| 338 virtual void Paste() OVERRIDE; | 338 virtual void Paste() OVERRIDE; |
| 339 virtual void ShowInstant(TabContents* preview) OVERRIDE; | 339 virtual void ShowInstant(TabContents* preview, |
| 340 int height, |
| 341 InstantSizeUnits units) OVERRIDE; |
| 340 virtual void HideInstant() OVERRIDE; | 342 virtual void HideInstant() OVERRIDE; |
| 341 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 343 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
| 342 virtual bool IsInstantTabShowing() OVERRIDE; | 344 virtual bool IsInstantTabShowing() OVERRIDE; |
| 343 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 345 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 344 const gfx::Rect& bounds) OVERRIDE; | 346 const gfx::Rect& bounds) OVERRIDE; |
| 345 virtual FindBar* CreateFindBar() OVERRIDE; | 347 virtual FindBar* CreateFindBar() OVERRIDE; |
| 346 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 348 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
| 347 const gfx::Rect& rect) OVERRIDE; | 349 const gfx::Rect& rect) OVERRIDE; |
| 348 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; | 350 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; |
| 349 virtual void ShowPasswordGenerationBubble( | 351 virtual void ShowPasswordGenerationBubble( |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 #if defined(USE_AURA) | 725 #if defined(USE_AURA) |
| 724 scoped_ptr<SearchViewController> search_view_controller_; | 726 scoped_ptr<SearchViewController> search_view_controller_; |
| 725 #endif | 727 #endif |
| 726 | 728 |
| 727 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 729 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 728 | 730 |
| 729 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 731 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 730 }; | 732 }; |
| 731 | 733 |
| 732 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 734 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |