| 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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 virtual void HandleKeyboardEvent( | 324 virtual void HandleKeyboardEvent( |
| 325 const content::NativeWebKeyboardEvent& event) OVERRIDE; | 325 const content::NativeWebKeyboardEvent& event) OVERRIDE; |
| 326 virtual void ShowCreateChromeAppShortcutsDialog( | 326 virtual void ShowCreateChromeAppShortcutsDialog( |
| 327 Profile*, const extensions::Extension* app) OVERRIDE; | 327 Profile*, const extensions::Extension* app) OVERRIDE; |
| 328 virtual void Cut() OVERRIDE; | 328 virtual void Cut() OVERRIDE; |
| 329 virtual void Copy() OVERRIDE; | 329 virtual void Copy() OVERRIDE; |
| 330 virtual void Paste() OVERRIDE; | 330 virtual void Paste() OVERRIDE; |
| 331 virtual void ShowInstant(TabContents* preview) OVERRIDE; | 331 virtual void ShowInstant(TabContents* preview) OVERRIDE; |
| 332 virtual void HideInstant() OVERRIDE; | 332 virtual void HideInstant() OVERRIDE; |
| 333 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 333 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
| 334 virtual bool GetIsShowingInstant() OVERRIDE; |
| 334 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 335 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 335 const gfx::Rect& bounds) OVERRIDE; | 336 const gfx::Rect& bounds) OVERRIDE; |
| 336 virtual FindBar* CreateFindBar() OVERRIDE; | 337 virtual FindBar* CreateFindBar() OVERRIDE; |
| 337 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 338 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
| 338 const gfx::Rect& rect) OVERRIDE; | 339 const gfx::Rect& rect) OVERRIDE; |
| 339 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; | 340 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; |
| 340 virtual void ShowPasswordGenerationBubble( | 341 virtual void ShowPasswordGenerationBubble( |
| 341 const gfx::Rect& rect, | 342 const gfx::Rect& rect, |
| 342 autofill::PasswordGenerator* password_generator, | 343 autofill::PasswordGenerator* password_generator, |
| 343 const webkit::forms::PasswordForm& form) OVERRIDE; | 344 const webkit::forms::PasswordForm& form) OVERRIDE; |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 #if defined(USE_AURA) | 715 #if defined(USE_AURA) |
| 715 scoped_ptr<SearchViewController> search_view_controller_; | 716 scoped_ptr<SearchViewController> search_view_controller_; |
| 716 #endif | 717 #endif |
| 717 | 718 |
| 718 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 719 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 719 | 720 |
| 720 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 721 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 721 }; | 722 }; |
| 722 | 723 |
| 723 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 724 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |