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

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

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
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble_views.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" 5 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 // Clickable hint text for exiting fullscreen mode. 58 // Clickable hint text for exiting fullscreen mode.
59 views::Link link_; 59 views::Link link_;
60 // Instruction for exiting mouse lock. 60 // Instruction for exiting mouse lock.
61 views::Label mouse_lock_exit_instruction_; 61 views::Label mouse_lock_exit_instruction_;
62 // Informational label: 'www.foo.com has gone fullscreen'. 62 // Informational label: 'www.foo.com has gone fullscreen'.
63 views::Label message_label_; 63 views::Label message_label_;
64 views::NativeTextButton* accept_button_; 64 views::NativeTextButton* accept_button_;
65 views::NativeTextButton* deny_button_; 65 views::NativeTextButton* deny_button_;
66 const string16 browser_fullscreen_exit_accelerator_; 66 const string16 browser_fullscreen_exit_accelerator_;
67
68 DISALLOW_COPY_AND_ASSIGN(FullscreenExitView);
67 }; 69 };
68 70
69 FullscreenExitBubbleViews::FullscreenExitView::FullscreenExitView( 71 FullscreenExitBubbleViews::FullscreenExitView::FullscreenExitView(
70 FullscreenExitBubbleViews* bubble, 72 FullscreenExitBubbleViews* bubble,
71 const string16& accelerator, 73 const string16& accelerator,
72 const GURL& url, 74 const GURL& url,
73 FullscreenExitBubbleType bubble_type) 75 FullscreenExitBubbleType bubble_type)
74 : bubble_(bubble), 76 : bubble_(bubble),
75 accept_button_(NULL), 77 accept_button_(NULL),
76 deny_button_(NULL), 78 deny_button_(NULL),
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 size.set_height(size.height() - popup_bottom + y_offset); 380 size.set_height(size.height() - popup_bottom + y_offset);
379 origin.set_y(origin.y() - y_offset); 381 origin.set_y(origin.y() - y_offset);
380 } 382 }
381 return gfx::Rect(origin, size); 383 return gfx::Rect(origin, size);
382 } 384 }
383 385
384 void FullscreenExitBubbleViews::StartWatchingMouseIfNecessary() { 386 void FullscreenExitBubbleViews::StartWatchingMouseIfNecessary() {
385 if (!fullscreen_bubble::ShowButtonsForType(bubble_type_)) 387 if (!fullscreen_bubble::ShowButtonsForType(bubble_type_))
386 StartWatchingMouse(); 388 StartWatchingMouse();
387 } 389 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble_views.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698