| 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 ASH_LAUNCHER_LAUNCHER_VIEW_H_ |    5 #ifndef ASH_LAUNCHER_LAUNCHER_VIEW_H_ | 
|    6 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_ |    6 #define ASH_LAUNCHER_LAUNCHER_VIEW_H_ | 
|    7  |    7  | 
|    8 #include <utility> |    8 #include <utility> | 
|    9 #include <vector> |    9 #include <vector> | 
|   10  |   10  | 
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   98   // Overridden from FocusTraversable: |   98   // Overridden from FocusTraversable: | 
|   99   virtual views::FocusSearch* GetFocusSearch() OVERRIDE; |   99   virtual views::FocusSearch* GetFocusSearch() OVERRIDE; | 
|  100   virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; |  100   virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; | 
|  101   virtual View* GetFocusTraversableParentView() OVERRIDE; |  101   virtual View* GetFocusTraversableParentView() OVERRIDE; | 
|  102  |  102  | 
|  103   // Overridden from app_list::ApplicationDragAndDropHost: |  103   // Overridden from app_list::ApplicationDragAndDropHost: | 
|  104   virtual void CreateDragIconProxy( |  104   virtual void CreateDragIconProxy( | 
|  105       const gfx::Point& location_in_screen_coordinates, |  105       const gfx::Point& location_in_screen_coordinates, | 
|  106       const gfx::ImageSkia& icon, |  106       const gfx::ImageSkia& icon, | 
|  107       views::View* replaced_view, |  107       views::View* replaced_view, | 
 |  108       const gfx::Vector2d& cursor_offset_from_center, | 
|  108       float scale_factor) OVERRIDE; |  109       float scale_factor) OVERRIDE; | 
|  109   virtual void UpdateDragIconProxy( |  110   virtual void UpdateDragIconProxy( | 
|  110       const gfx::Point& location_in_screen_coordinates) OVERRIDE; |  111       const gfx::Point& location_in_screen_coordinates) OVERRIDE; | 
|  111   virtual void DestroyDragIconProxy() OVERRIDE; |  112   virtual void DestroyDragIconProxy() OVERRIDE; | 
|  112   virtual bool StartDrag( |  113   virtual bool StartDrag( | 
|  113       const std::string& app_id, |  114       const std::string& app_id, | 
|  114       const gfx::Point& location_in_screen_coordinates) OVERRIDE; |  115       const gfx::Point& location_in_screen_coordinates) OVERRIDE; | 
|  115   virtual bool Drag(const gfx::Point& location_in_screen_coordinates) OVERRIDE; |  116   virtual bool Drag(const gfx::Point& location_in_screen_coordinates) OVERRIDE; | 
|  116   virtual void EndDrag(bool cancel) OVERRIDE; |  117   virtual void EndDrag(bool cancel) OVERRIDE; | 
|  117  |  118  | 
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  368   // The view which gets replaced by our drag icon proxy. |  369   // The view which gets replaced by our drag icon proxy. | 
|  369   views::View* drag_replaced_view_; |  370   views::View* drag_replaced_view_; | 
|  370  |  371  | 
|  371   DISALLOW_COPY_AND_ASSIGN(LauncherView); |  372   DISALLOW_COPY_AND_ASSIGN(LauncherView); | 
|  372 }; |  373 }; | 
|  373  |  374  | 
|  374 }  // namespace internal |  375 }  // namespace internal | 
|  375 }  // namespace ash |  376 }  // namespace ash | 
|  376  |  377  | 
|  377 #endif  // ASH_LAUNCHER_LAUNCHER_VIEW_H_ |  378 #endif  // ASH_LAUNCHER_LAUNCHER_VIEW_H_ | 
| OLD | NEW |