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

Side by Side Diff: chrome/browser/ui/views/location_bar/page_action_with_badge_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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "chrome/browser/ui/views/location_bar/touchable_location_bar_view.h"
10 #include "ui/gfx/size.h" 9 #include "ui/gfx/size.h"
11 #include "ui/views/view.h" 10 #include "ui/views/view.h"
12 11
13 class GURL; 12 class GURL;
14 class PageActionImageView; 13 class PageActionImageView;
15 14
16 namespace content { 15 namespace content {
17 class WebContents; 16 class WebContents;
18 } 17 }
19 18
20 // A container for the PageActionImageView plus its badge. 19 // A container for the PageActionImageView plus its badge.
21 class PageActionWithBadgeView 20 class PageActionWithBadgeView : public views::View {
22 : public views::View,
23 public TouchableLocationBarView {
24 public: 21 public:
25 explicit PageActionWithBadgeView(PageActionImageView* image_view); 22 explicit PageActionWithBadgeView(PageActionImageView* image_view);
26 23
27 PageActionImageView* image_view() { return image_view_; } 24 PageActionImageView* image_view() { return image_view_; }
28 25
29 // View overrides: 26 // views::View:
30 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 27 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
31 virtual gfx::Size GetPreferredSize() OVERRIDE; 28 virtual gfx::Size GetPreferredSize() OVERRIDE;
32 29
33 // TouchableLocationBarView.
34 virtual int GetBuiltInHorizontalPadding() const OVERRIDE;
35
36 void UpdateVisibility(content::WebContents* contents, const GURL& url); 30 void UpdateVisibility(content::WebContents* contents, const GURL& url);
37 31
38 private: 32 private:
39 virtual void Layout() OVERRIDE; 33 virtual void Layout() OVERRIDE;
40 34
41 // The button this view contains. 35 // The button this view contains.
42 PageActionImageView* image_view_; 36 PageActionImageView* image_view_;
43 37
44 DISALLOW_COPY_AND_ASSIGN(PageActionWithBadgeView); 38 DISALLOW_COPY_AND_ASSIGN(PageActionWithBadgeView);
45 }; 39 };
46 40
47 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_ 41 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698