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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 10696158: Rename WasRestored to WasShown across all uses. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Bring to ToT to commit 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
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 "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/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); 267 window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
268 window_->SetParent(NULL); 268 window_->SetParent(NULL);
269 Show(); 269 Show();
270 Focus(); 270 Focus();
271 } 271 }
272 272
273 RenderWidgetHost* RenderWidgetHostViewAura::GetRenderWidgetHost() const { 273 RenderWidgetHost* RenderWidgetHostViewAura::GetRenderWidgetHost() const {
274 return host_; 274 return host_;
275 } 275 }
276 276
277 void RenderWidgetHostViewAura::WasRestored() { 277 void RenderWidgetHostViewAura::WasShown() {
278 if (!host_->IsHidden()) 278 if (!host_->IsHidden())
279 return; 279 return;
280 host_->WasRestored(); 280 host_->WasShown();
281 281
282 if (!current_surface_ && host_->is_accelerated_compositing_active() && 282 if (!current_surface_ && host_->is_accelerated_compositing_active() &&
283 !released_front_lock_.get()) { 283 !released_front_lock_.get()) {
284 released_front_lock_ = window_->GetRootWindow()->GetCompositorLock(); 284 released_front_lock_ = window_->GetRootWindow()->GetCompositorLock();
285 } 285 }
286 286
287 AdjustSurfaceProtection(); 287 AdjustSurfaceProtection();
288 } 288 }
289 289
290 void RenderWidgetHostViewAura::WasHidden() { 290 void RenderWidgetHostViewAura::WasHidden() {
(...skipping 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after
1642 RenderWidgetHost* widget) { 1642 RenderWidgetHost* widget) {
1643 return new RenderWidgetHostViewAura(widget); 1643 return new RenderWidgetHostViewAura(widget);
1644 } 1644 }
1645 1645
1646 // static 1646 // static
1647 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { 1647 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
1648 GetScreenInfoForWindow(results, NULL); 1648 GetScreenInfoForWindow(results, NULL);
1649 } 1649 }
1650 1650
1651 } // namespace content 1651 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698