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 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 : rwhva_(rwhva) { | 350 : rwhva_(rwhva) { |
351 DCHECK(rwhva_); | 351 DCHECK(rwhva_); |
352 aura::Env::GetInstance()->AddPreTargetHandler(this); | 352 aura::Env::GetInstance()->AddPreTargetHandler(this); |
353 } | 353 } |
354 | 354 |
355 virtual ~EventFilterForPopupExit() { | 355 virtual ~EventFilterForPopupExit() { |
356 aura::Env::GetInstance()->RemovePreTargetHandler(this); | 356 aura::Env::GetInstance()->RemovePreTargetHandler(this); |
357 } | 357 } |
358 | 358 |
359 // Overridden from ui::EventHandler | 359 // Overridden from ui::EventHandler |
360 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { | 360 virtual void OnMouseEvent(ui::MouseEvent* event) override { |
361 rwhva_->ApplyEventFilterForPopupExit(event); | 361 rwhva_->ApplyEventFilterForPopupExit(event); |
362 } | 362 } |
363 | 363 |
364 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE { | 364 virtual void OnTouchEvent(ui::TouchEvent* event) override { |
365 rwhva_->ApplyEventFilterForPopupExit(event); | 365 rwhva_->ApplyEventFilterForPopupExit(event); |
366 } | 366 } |
367 | 367 |
368 private: | 368 private: |
369 RenderWidgetHostViewAura* rwhva_; | 369 RenderWidgetHostViewAura* rwhva_; |
370 | 370 |
371 DISALLOW_COPY_AND_ASSIGN(EventFilterForPopupExit); | 371 DISALLOW_COPY_AND_ASSIGN(EventFilterForPopupExit); |
372 }; | 372 }; |
373 | 373 |
374 void RenderWidgetHostViewAura::ApplyEventFilterForPopupExit( | 374 void RenderWidgetHostViewAura::ApplyEventFilterForPopupExit( |
(...skipping 26 matching lines...) Expand all Loading... |
401 explicit WindowObserver(RenderWidgetHostViewAura* view) | 401 explicit WindowObserver(RenderWidgetHostViewAura* view) |
402 : view_(view) { | 402 : view_(view) { |
403 view_->window_->AddObserver(this); | 403 view_->window_->AddObserver(this); |
404 } | 404 } |
405 | 405 |
406 virtual ~WindowObserver() { | 406 virtual ~WindowObserver() { |
407 view_->window_->RemoveObserver(this); | 407 view_->window_->RemoveObserver(this); |
408 } | 408 } |
409 | 409 |
410 // Overridden from aura::WindowObserver: | 410 // Overridden from aura::WindowObserver: |
411 virtual void OnWindowAddedToRootWindow(aura::Window* window) OVERRIDE { | 411 virtual void OnWindowAddedToRootWindow(aura::Window* window) override { |
412 if (window == view_->window_) | 412 if (window == view_->window_) |
413 view_->AddedToRootWindow(); | 413 view_->AddedToRootWindow(); |
414 } | 414 } |
415 | 415 |
416 virtual void OnWindowRemovingFromRootWindow(aura::Window* window, | 416 virtual void OnWindowRemovingFromRootWindow(aura::Window* window, |
417 aura::Window* new_root) OVERRIDE { | 417 aura::Window* new_root) override { |
418 if (window == view_->window_) | 418 if (window == view_->window_) |
419 view_->RemovingFromRootWindow(); | 419 view_->RemovingFromRootWindow(); |
420 } | 420 } |
421 | 421 |
422 private: | 422 private: |
423 RenderWidgetHostViewAura* view_; | 423 RenderWidgetHostViewAura* view_; |
424 | 424 |
425 DISALLOW_COPY_AND_ASSIGN(WindowObserver); | 425 DISALLOW_COPY_AND_ASSIGN(WindowObserver); |
426 }; | 426 }; |
427 | 427 |
(...skipping 2148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2576 | 2576 |
2577 //////////////////////////////////////////////////////////////////////////////// | 2577 //////////////////////////////////////////////////////////////////////////////// |
2578 // RenderWidgetHostViewBase, public: | 2578 // RenderWidgetHostViewBase, public: |
2579 | 2579 |
2580 // static | 2580 // static |
2581 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2581 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2582 GetScreenInfoForWindow(results, NULL); | 2582 GetScreenInfoForWindow(results, NULL); |
2583 } | 2583 } |
2584 | 2584 |
2585 } // namespace content | 2585 } // namespace content |
OLD | NEW |