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

Side by Side Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.h

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 8 years, 9 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_CONTENT_SETTING_IMAGE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; 53 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
54 virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE; 54 virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
55 55
56 // views::Widget::Observer override: 56 // views::Widget::Observer override:
57 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; 57 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
58 58
59 private: 59 private:
60 // views::ImageView overrides: 60 // views::ImageView overrides:
61 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 61 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
62 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; 62 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
63 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 63 virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
64 virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; 64 virtual void OnPaintBackground(gfx::CanvasSkia* canvas) OVERRIDE;
65 65
66 scoped_ptr<ContentSettingImageModel> content_setting_image_model_; 66 scoped_ptr<ContentSettingImageModel> content_setting_image_model_;
67 67
68 views::Widget* bubble_widget_; 68 views::Widget* bubble_widget_;
69 69
70 // The owning LocationBarView. 70 // The owning LocationBarView.
71 LocationBarView* parent_; 71 LocationBarView* parent_;
72 72
73 scoped_ptr<ui::SlideAnimation> slide_animator_; 73 scoped_ptr<ui::SlideAnimation> slide_animator_;
74 string16 animated_text_; 74 string16 animated_text_;
75 bool pause_animation_; 75 bool pause_animation_;
76 int text_size_; 76 int text_size_;
77 int visible_text_size_; 77 int visible_text_size_;
78 gfx::Insets saved_insets_; 78 gfx::Insets saved_insets_;
79 79
80 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingImageView); 80 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingImageView);
81 }; 81 };
82 82
83 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 83 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698