Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6406)

Unified Diff: chrome/browser/ui/views/infobars/infobar_view.h

Issue 2347773003: Remove pre-MD infobar code (on Views). (Closed)
Patch Set: pkasting review/button image clear out Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/infobars/infobar_view.h
diff --git a/chrome/browser/ui/views/infobars/infobar_view.h b/chrome/browser/ui/views/infobars/infobar_view.h
index 23d6e21e9b6160e94128b704b4044734c95d06ec..0bdb6dbfafe88b20fe83384af378cee71ad64372 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.h
+++ b/chrome/browser/ui/views/infobars/infobar_view.h
@@ -21,15 +21,14 @@ class MenuModel;
}
namespace views {
-class ImageButton;
class ImageView;
class Label;
class LabelButton;
class Link;
class LinkListener;
-class MdTextButton;
class MenuButton;
class MenuRunner;
+class VectorIconButton;
} // namespace views
class InfoBarView : public infobars::InfoBar,
@@ -41,8 +40,6 @@ class InfoBarView : public infobars::InfoBar,
explicit InfoBarView(std::unique_ptr<infobars::InfoBarDelegate> delegate);
const infobars::InfoBarContainer::Delegate* container_delegate() const;
- const SkPath& fill_path() const { return fill_path_; }
- const SkPath& stroke_path() const { return stroke_path_; }
protected:
typedef std::vector<views::Label*> Labels;
@@ -61,12 +58,6 @@ class InfoBarView : public infobars::InfoBar,
views::Link* CreateLink(const base::string16& text,
views::LinkListener* listener) const;
- // Creates a focusable button for use on an infobar. The appearance is
- // customized for infobars. Used for pre-MD only.
- // NOTE: Subclasses must ignore button presses if we're unowned.
- static views::LabelButton* CreateTextButton(views::ButtonListener* listener,
- const base::string16& text);
-
// Given |labels| and the total |available_width| to display them in, sets
// each label's size so that the longest label shrinks until it reaches the
// length of the next-longest label, then both shrink until reaching the
@@ -140,12 +131,7 @@ class InfoBarView : public infobars::InfoBar,
views::ImageView* icon_;
// The close button at the right edge of the InfoBar.
- views::ImageButton* close_button_;
-
- // The paths for the InfoBarBackground to draw, sized according to the heights
- // above. TODO(estade): remove these when MD is default.
- SkPath fill_path_;
- SkPath stroke_path_;
+ views::VectorIconButton* close_button_;
// Used to run the menu.
std::unique_ptr<views::MenuRunner> menu_runner_;
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar_container_view.cc ('k') | chrome/browser/ui/views/infobars/infobar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698