| OLD | NEW | 
|   1 // Copyright 2014 The Chromium Authors. All rights reserved. |   1 // Copyright 2014 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_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ |   5 #ifndef ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ | 
|   6 #define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ |   6 #define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ | 
|   7  |   7  | 
|   8 #include "ash/ash_export.h" |   8 #include "ash/ash_export.h" | 
|   9 #include "ash/session/session_state_observer.h" |   9 #include "ash/session/session_state_observer.h" | 
|  10 #include "ash/shell_observer.h" |  10 #include "ash/shell_observer.h" | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  42   // ShellObserver: |  42   // ShellObserver: | 
|  43   void OnMaximizeModeStarted() override; |  43   void OnMaximizeModeStarted() override; | 
|  44   void OnMaximizeModeEnded() override; |  44   void OnMaximizeModeEnded() override; | 
|  45   void OnOverviewModeEnded() override; |  45   void OnOverviewModeEnded() override; | 
|  46  |  46  | 
|  47   // TrayBackgroundView: |  47   // TrayBackgroundView: | 
|  48   void ClickedOutsideBubble() override; |  48   void ClickedOutsideBubble() override; | 
|  49   base::string16 GetAccessibleNameForTray() override; |  49   base::string16 GetAccessibleNameForTray() override; | 
|  50   void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; |  50   void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; | 
|  51   void SetShelfAlignment(wm::ShelfAlignment alignment) override; |  51   void SetShelfAlignment(wm::ShelfAlignment alignment) override; | 
 |  52   void GetHitRegionInsets(gfx::Insets& insets) override; | 
|  52  |  53  | 
|  53  private: |  54  private: | 
|  54   friend class OverviewButtonTrayTest; |  55   friend class OverviewButtonTrayTest; | 
|  55  |  56  | 
|  56   // Creates a new border for the icon. The padding is determined based on the |  57   // Creates a new border for the icon. The padding is determined based on the | 
|  57   // alignment of the shelf. |  58   // alignment of the shelf. | 
|  58   void SetIconBorderForShelfAlignment(); |  59   void SetIconBorderForShelfAlignment(); | 
|  59  |  60  | 
|  60   // Sets the icon to visible if maximize mode is enabled and |  61   // Sets the icon to visible if maximize mode is enabled and | 
|  61   // WindowSelectorController::CanSelect. |  62   // WindowSelectorController::CanSelect. | 
|  62   void UpdateIconVisibility(); |  63   void UpdateIconVisibility(); | 
|  63  |  64  | 
|  64   // Weak pointer, will be parented by TrayContainer for its lifetime. |  65   // Weak pointer, will be parented by TrayContainer for its lifetime. | 
|  65   views::ImageView* icon_; |  66   views::ImageView* icon_; | 
|  66  |  67  | 
|  67   DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray); |  68   DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray); | 
|  68 }; |  69 }; | 
|  69  |  70  | 
|  70 }  // namespace ash |  71 }  // namespace ash | 
|  71  |  72  | 
|  72 #endif  // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ |  73 #endif  // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ | 
| OLD | NEW |