| 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_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_ | 
| 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_ | 
| 7 | 7 | 
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" | 
| 9 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 9 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 
| 10 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 10 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 57   virtual bool IsHoveredIndex(size_t index) const OVERRIDE; | 57   virtual bool IsHoveredIndex(size_t index) const OVERRIDE; | 
| 58   virtual gfx::Image GetIconIfExtensionMatch(size_t index) const OVERRIDE; | 58   virtual gfx::Image GetIconIfExtensionMatch(size_t index) const OVERRIDE; | 
| 59 | 59 | 
| 60   // Overridden from ui::AnimationDelegate: | 60   // Overridden from ui::AnimationDelegate: | 
| 61   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; | 61   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; | 
| 62   virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; | 62   virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; | 
| 63 | 63 | 
| 64   // Overridden from views::View: | 64   // Overridden from views::View: | 
| 65   virtual gfx::Size GetPreferredSize() OVERRIDE; | 65   virtual gfx::Size GetPreferredSize() OVERRIDE; | 
| 66   virtual void Layout() OVERRIDE; | 66   virtual void Layout() OVERRIDE; | 
| 67   virtual views::View* GetEventHandlerForPoint( | 67   virtual views::View* GetEventHandler(const gfx::Rect& rect, EventType type) | 
| 68       const gfx::Point& point) OVERRIDE; | 68       OVERRIDE; | 
| 69   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; | 69   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; | 
| 70   virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; | 70   virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; | 
| 71   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; | 71   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; | 
| 72   virtual void OnMouseCaptureLost() OVERRIDE; | 72   virtual void OnMouseCaptureLost() OVERRIDE; | 
| 73   virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; | 73   virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; | 
| 74   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; | 74   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; | 
| 75   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; | 75   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; | 
| 76   virtual ui::EventResult OnGestureEvent( | 76   virtual ui::EventResult OnGestureEvent( | 
| 77       const ui::GestureEvent& event) OVERRIDE; | 77       const ui::GestureEvent& event) OVERRIDE; | 
| 78 | 78 | 
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 152   // shorter (not larger, that makes it look "slow"). | 152   // shorter (not larger, that makes it look "slow"). | 
| 153   ui::SlideAnimation size_animation_; | 153   ui::SlideAnimation size_animation_; | 
| 154   // TODO(sky): convert to sizes. | 154   // TODO(sky): convert to sizes. | 
| 155   gfx::Rect start_bounds_; | 155   gfx::Rect start_bounds_; | 
| 156   gfx::Rect target_bounds_; | 156   gfx::Rect target_bounds_; | 
| 157 | 157 | 
| 158   DISALLOW_COPY_AND_ASSIGN(InlineOmniboxPopupView); | 158   DISALLOW_COPY_AND_ASSIGN(InlineOmniboxPopupView); | 
| 159 }; | 159 }; | 
| 160 | 160 | 
| 161 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_ | 161 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_ | 
| OLD | NEW | 
|---|