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

Side by Side Diff: chrome/browser/ui/views/fullscreen_exit_bubble_views.h

Issue 8586033: Fixes use after free in BrowserView, and cleans up a couple of style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_FULLSCREEN_EXIT_BUBBLE_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FULLSCREEN_EXIT_BUBBLE_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_FULLSCREEN_EXIT_BUBBLE_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FULLSCREEN_EXIT_BUBBLE_VIEWS_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "chrome/browser/ui/fullscreen_exit_bubble.h" 10 #include "chrome/browser/ui/fullscreen_exit_bubble.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 virtual bool IsAnimating() OVERRIDE; 46 virtual bool IsAnimating() OVERRIDE;
47 47
48 private: 48 private:
49 class FullscreenExitView; 49 class FullscreenExitView;
50 50
51 void StartWatchingMouseIfNecessary(); 51 void StartWatchingMouseIfNecessary();
52 52
53 // views::LinkListener: 53 // views::LinkListener:
54 virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; 54 virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
55 55
56 // ui::AnimationDelegate:
57 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
58 virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
59
56 // The root view containing us. 60 // The root view containing us.
57 views::View* root_view_; 61 views::View* root_view_;
58 62
59 views::Widget* popup_; 63 views::Widget* popup_;
60 64
61 // Animation controlling sliding into/out of the top of the screen. 65 // Animation controlling sliding into/out of the top of the screen.
62 scoped_ptr<ui::SlideAnimation> size_animation_; 66 scoped_ptr<ui::SlideAnimation> size_animation_;
63 67
64 // ui::AnimationDelegate:
65 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
66 virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
67
68 // The contents of the popup. 68 // The contents of the popup.
69 FullscreenExitView* view_; 69 FullscreenExitView* view_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(FullscreenExitBubbleViews); 71 DISALLOW_COPY_AND_ASSIGN(FullscreenExitBubbleViews);
72 }; 72 };
73 73
74 #endif // CHROME_BROWSER_UI_VIEWS_FULLSCREEN_EXIT_BUBBLE_VIEWS_H_ 74 #endif // CHROME_BROWSER_UI_VIEWS_FULLSCREEN_EXIT_BUBBLE_VIEWS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/fullscreen_exit_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698