chrome/browser/ui/views/location_bar/content_setting_image_view.h - Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

OLD	NEW
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	7

	8 #include "base/macros.h"

8 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

9 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"	10 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"

10 #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"	11 #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"

11 #include "components/content_settings/core/common/content_settings_types.h"	12 #include "components/content_settings/core/common/content_settings_types.h"

12 #include "ui/gfx/animation/animation_delegate.h"	13 #include "ui/gfx/animation/animation_delegate.h"

13 #include "ui/gfx/animation/slide_animation.h"	14 #include "ui/gfx/animation/slide_animation.h"

14 #include "ui/views/painter.h"	15 #include "ui/views/painter.h"

15 #include "ui/views/view.h"	16 #include "ui/views/view.h"

16 #include "ui/views/widget/widget_observer.h"	17 #include "ui/views/widget/widget_observer.h"

17	18

(...skipping 70 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
88 scoped_ptr<ContentSettingImageModel> content_setting_image_model_;	89 scoped_ptr<ContentSettingImageModel> content_setting_image_model_;

89 gfx::SlideAnimation slide_animator_;	90 gfx::SlideAnimation slide_animator_;

90 bool pause_animation_;	91 bool pause_animation_;

91 double pause_animation_state_;	92 double pause_animation_state_;

92 views::Widget* bubble_widget_;	93 views::Widget* bubble_widget_;

93	94

94 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView);	95 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView);

95 };	96 };

96	97

97 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_	98 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_

OLD	NEW