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

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

Issue 10827271: Replace views::Event with ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 #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 "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 public views::LinkListener { 81 public views::LinkListener {
82 public: 82 public:
83 FullscreenExitView(FullscreenExitBubbleViews* bubble, 83 FullscreenExitView(FullscreenExitBubbleViews* bubble,
84 const string16& accelerator, 84 const string16& accelerator,
85 const GURL& url, 85 const GURL& url,
86 FullscreenExitBubbleType bubble_type); 86 FullscreenExitBubbleType bubble_type);
87 virtual ~FullscreenExitView(); 87 virtual ~FullscreenExitView();
88 88
89 // views::ButtonListener 89 // views::ButtonListener
90 virtual void ButtonPressed(views::Button* sender, 90 virtual void ButtonPressed(views::Button* sender,
91 const views::Event& event) OVERRIDE; 91 const ui::Event& event) OVERRIDE;
92 92
93 // views::LinkListener 93 // views::LinkListener
94 virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; 94 virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
95 95
96 void UpdateContent(const GURL& url, FullscreenExitBubbleType bubble_type); 96 void UpdateContent(const GURL& url, FullscreenExitBubbleType bubble_type);
97 97
98 private: 98 private:
99 FullscreenExitBubbleViews* bubble_; 99 FullscreenExitBubbleViews* bubble_;
100 100
101 // Clickable hint text for exiting fullscreen mode. 101 // Clickable hint text for exiting fullscreen mode.
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 SetLayoutManager(layout); 182 SetLayoutManager(layout);
183 183
184 UpdateContent(url, bubble_type); 184 UpdateContent(url, bubble_type);
185 } 185 }
186 186
187 FullscreenExitBubbleViews::FullscreenExitView::~FullscreenExitView() { 187 FullscreenExitBubbleViews::FullscreenExitView::~FullscreenExitView() {
188 } 188 }
189 189
190 void FullscreenExitBubbleViews::FullscreenExitView::ButtonPressed( 190 void FullscreenExitBubbleViews::FullscreenExitView::ButtonPressed(
191 views::Button* sender, 191 views::Button* sender,
192 const views::Event& event) { 192 const ui::Event& event) {
193 if (sender == button_view_->accept_button()) 193 if (sender == button_view_->accept_button())
194 bubble_->Accept(); 194 bubble_->Accept();
195 else 195 else
196 bubble_->Cancel(); 196 bubble_->Cancel();
197 } 197 }
198 198
199 void FullscreenExitBubbleViews::FullscreenExitView::LinkClicked( 199 void FullscreenExitBubbleViews::FullscreenExitView::LinkClicked(
200 views::Link* link, 200 views::Link* link,
201 int event_flags) { 201 int event_flags) {
202 bubble_->ToggleFullscreen(); 202 bubble_->ToggleFullscreen();
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 } 381 }
382 382
383 bool FullscreenExitBubbleViews::IsAnimating() { 383 bool FullscreenExitBubbleViews::IsAnimating() {
384 return size_animation_->GetCurrentValue() != 0; 384 return size_animation_->GetCurrentValue() != 0;
385 } 385 }
386 386
387 void FullscreenExitBubbleViews::StartWatchingMouseIfNecessary() { 387 void FullscreenExitBubbleViews::StartWatchingMouseIfNecessary() {
388 if (!fullscreen_bubble::ShowButtonsForType(bubble_type_)) 388 if (!fullscreen_bubble::ShowButtonsForType(bubble_type_))
389 StartWatchingMouse(); 389 StartWatchingMouse();
390 } 390 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.cc ('k') | chrome/browser/ui/views/global_error_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698