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

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

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.h
diff --git a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h
index da90fbcd1727ed89b17b7386b1269305558d75af..867e8d89100f9a3ead33a7f50af50c63a2809e99 100644
--- a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h
+++ b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h
@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_OPEN_PDF_IN_READER_VIEW_H_
#define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_OPEN_PDF_IN_READER_VIEW_H_
-#include "chrome/browser/ui/views/location_bar/touchable_location_bar_view.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/widget/widget_observer.h"
@@ -19,27 +18,23 @@ class WebContents;
// A Page Action image view for the "Open PDF in Reader" bubble.
class OpenPDFInReaderView : public views::ImageView,
- public TouchableLocationBarView,
- views::WidgetObserver {
+ public views::WidgetObserver {
public:
explicit OpenPDFInReaderView(LocationBarView* location_bar_view);
virtual ~OpenPDFInReaderView();
void Update(content::WebContents* web_contents);
- // TouchableLocationBarView overrides:
- virtual int GetBuiltInHorizontalPadding() const OVERRIDE;
-
private:
void ShowBubble();
- // views::ImageView overrides:
+ // views::ImageView:
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
- // views::WidgetObserver override:
+ // views::WidgetObserver:
virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
// The LocationBarView hosting this view.
@@ -50,7 +45,7 @@ class OpenPDFInReaderView : public views::ImageView,
// Weak pointer; owned by the PDFTabHelper of the currently active tab.
OpenPDFInReaderPromptDelegate* model_;
- DISALLOW_IMPLICIT_CONSTRUCTORS(OpenPDFInReaderView);
+ DISALLOW_COPY_AND_ASSIGN(OpenPDFInReaderView);
};
#endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_OPEN_PDF_IN_READER_VIEW_H_

Powered by Google App Engine
This is Rietveld 408576698