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

Unified Diff: chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc

Issue 21696003: views/location_bar: Eliminate TouchableLocationBarView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix wrapping Created 7 years, 4 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/location_bar/open_pdf_in_reader_view.cc
diff --git a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
index dc3a00567b0b5eb86ff2ccdc5a8a87eab84fa16c..33607ad1bf6424f8543cef393f2f28bee212b50b 100644
--- a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
+++ b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h"
#include "chrome/browser/ui/pdf/pdf_tab_helper.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "chrome/browser/ui/views/open_pdf_in_reader_bubble_view.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
@@ -18,12 +19,10 @@ OpenPDFInReaderView::OpenPDFInReaderView(LocationBarView* location_bar_view)
bubble_(NULL),
model_(NULL) {
set_accessibility_focusable(true);
- SetImage(
- ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_OMNIBOX_PDF_ICON));
- SetTooltipText(
- l10n_util::GetStringUTF16(IDS_PDF_BUBBLE_OPEN_IN_READER_LINK));
- TouchableLocationBarView::Init(this);
+ SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+ IDR_OMNIBOX_PDF_ICON));
+ SetTooltipText(l10n_util::GetStringUTF16(IDS_PDF_BUBBLE_OPEN_IN_READER_LINK));
+ LocationBarView::InitTouchableLocationBarChildView(this);
}
OpenPDFInReaderView::~OpenPDFInReaderView() {
@@ -41,10 +40,6 @@ void OpenPDFInReaderView::Update(content::WebContents* web_contents) {
SetVisible(!!model_);
}
-int OpenPDFInReaderView::GetBuiltInHorizontalPadding() const {
- return GetBuiltInHorizontalPaddingImpl();
-}
-
void OpenPDFInReaderView::ShowBubble() {
if (bubble_)
return;

Powered by Google App Engine
This is Rietveld 408576698