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/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 if (window->GetProperty(aura::client::kMirroringEnabledKey)) { | 477 if (window->GetProperty(aura::client::kMirroringEnabledKey)) { |
478 view_->web_contents_->IncrementCapturerCount(gfx::Size()); | 478 view_->web_contents_->IncrementCapturerCount(gfx::Size()); |
479 view_->web_contents_->UpdateWebContentsVisibility(true); | 479 view_->web_contents_->UpdateWebContentsVisibility(true); |
480 } else { | 480 } else { |
481 view_->web_contents_->DecrementCapturerCount(); | 481 view_->web_contents_->DecrementCapturerCount(); |
482 view_->web_contents_->UpdateWebContentsVisibility(window->IsVisible()); | 482 view_->web_contents_->UpdateWebContentsVisibility(window->IsVisible()); |
483 } | 483 } |
484 } | 484 } |
485 | 485 |
486 // Overridden WindowTreeHostObserver: | 486 // Overridden WindowTreeHostObserver: |
487 void OnHostMoved(const aura::WindowTreeHost* host, | 487 void OnHostMovedInPixels(const aura::WindowTreeHost* host, |
488 const gfx::Point& new_origin) override { | 488 const gfx::Point& new_origin_in_pixels) override { |
489 TRACE_EVENT1("ui", | 489 TRACE_EVENT1("ui", |
490 "WebContentsViewAura::WindowObserver::OnHostMoved", | 490 "WebContentsViewAura::WindowObserver::OnHostMovedInPixels", |
491 "new_origin", new_origin.ToString()); | 491 "new_origin_in_pixels", new_origin_in_pixels.ToString()); |
492 | 492 |
493 // This is for the desktop case (i.e. Aura desktop). | 493 // This is for the desktop case (i.e. Aura desktop). |
494 SendScreenRects(); | 494 SendScreenRects(); |
495 } | 495 } |
496 | 496 |
497 private: | 497 private: |
498 void SendScreenRects() { view_->web_contents_->SendScreenRects(); } | 498 void SendScreenRects() { view_->web_contents_->SendScreenRects(); } |
499 | 499 |
500 WebContentsViewAura* view_; | 500 WebContentsViewAura* view_; |
501 | 501 |
(...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1247 bool allow_multiple_selection) { | 1247 bool allow_multiple_selection) { |
1248 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; | 1248 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; |
1249 } | 1249 } |
1250 | 1250 |
1251 void WebContentsViewAura::HidePopupMenu() { | 1251 void WebContentsViewAura::HidePopupMenu() { |
1252 NOTIMPLEMENTED(); | 1252 NOTIMPLEMENTED(); |
1253 } | 1253 } |
1254 #endif | 1254 #endif |
1255 | 1255 |
1256 } // namespace content | 1256 } // namespace content |
OLD | NEW |