| 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_INFOBARS_INFOBAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "components/infobars/core/infobar.h" | 10 #include "components/infobars/core/infobar.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 class MenuButton; | 30 class MenuButton; |
| 31 class MenuRunner; | 31 class MenuRunner; |
| 32 } // namespace views | 32 } // namespace views |
| 33 | 33 |
| 34 class InfoBarView : public infobars::InfoBar, | 34 class InfoBarView : public infobars::InfoBar, |
| 35 public views::View, | 35 public views::View, |
| 36 public views::ButtonListener, | 36 public views::ButtonListener, |
| 37 public views::ExternalFocusTracker, | 37 public views::ExternalFocusTracker, |
| 38 public views::ViewTargeterDelegate { | 38 public views::ViewTargeterDelegate { |
| 39 public: | 39 public: |
| 40 explicit InfoBarView(scoped_ptr<infobars::InfoBarDelegate> delegate); | 40 explicit InfoBarView(std::unique_ptr<infobars::InfoBarDelegate> delegate); |
| 41 | 41 |
| 42 const infobars::InfoBarContainer::Delegate* container_delegate() const; | 42 const infobars::InfoBarContainer::Delegate* container_delegate() const; |
| 43 const SkPath& fill_path() const { return fill_path_; } | 43 const SkPath& fill_path() const { return fill_path_; } |
| 44 const SkPath& stroke_path() const { return stroke_path_; } | 44 const SkPath& stroke_path() const { return stroke_path_; } |
| 45 | 45 |
| 46 protected: | 46 protected: |
| 47 typedef std::vector<views::Label*> Labels; | 47 typedef std::vector<views::Label*> Labels; |
| 48 | 48 |
| 49 static const int kButtonButtonSpacing; | 49 static const int kButtonButtonSpacing; |
| 50 static const int kEndOfLabelSpacing; | 50 static const int kEndOfLabelSpacing; |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 | 142 |
| 143 // The close button at the right edge of the InfoBar. | 143 // The close button at the right edge of the InfoBar. |
| 144 views::ImageButton* close_button_; | 144 views::ImageButton* close_button_; |
| 145 | 145 |
| 146 // The paths for the InfoBarBackground to draw, sized according to the heights | 146 // The paths for the InfoBarBackground to draw, sized according to the heights |
| 147 // above. TODO(estade): remove these when MD is default. | 147 // above. TODO(estade): remove these when MD is default. |
| 148 SkPath fill_path_; | 148 SkPath fill_path_; |
| 149 SkPath stroke_path_; | 149 SkPath stroke_path_; |
| 150 | 150 |
| 151 // Used to run the menu. | 151 // Used to run the menu. |
| 152 scoped_ptr<views::MenuRunner> menu_runner_; | 152 std::unique_ptr<views::MenuRunner> menu_runner_; |
| 153 | 153 |
| 154 DISALLOW_COPY_AND_ASSIGN(InfoBarView); | 154 DISALLOW_COPY_AND_ASSIGN(InfoBarView); |
| 155 }; | 155 }; |
| 156 | 156 |
| 157 #endif // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_ | 157 #endif // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_ |
| OLD | NEW |