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

Side by Side Diff: apps/app_window.cc

Issue 266053003: Remove page IDs from three WebContentsObserver APIs that don't need it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "apps/app_window.h" 5 #include "apps/app_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "apps/app_window_geometry_cache.h" 9 #include "apps/app_window_geometry_cache.h"
10 #include "apps/app_window_registry.h" 10 #include "apps/app_window_registry.h"
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 } 474 }
475 475
476 bool AppWindow::PreHandleGestureEvent(WebContents* source, 476 bool AppWindow::PreHandleGestureEvent(WebContents* source,
477 const blink::WebGestureEvent& event) { 477 const blink::WebGestureEvent& event) {
478 // Disable pinch zooming in app windows. 478 // Disable pinch zooming in app windows.
479 return event.type == blink::WebGestureEvent::GesturePinchBegin || 479 return event.type == blink::WebGestureEvent::GesturePinchBegin ||
480 event.type == blink::WebGestureEvent::GesturePinchUpdate || 480 event.type == blink::WebGestureEvent::GesturePinchUpdate ||
481 event.type == blink::WebGestureEvent::GesturePinchEnd; 481 event.type == blink::WebGestureEvent::GesturePinchEnd;
482 } 482 }
483 483
484 void AppWindow::DidFirstVisuallyNonEmptyPaint(int32 page_id) { 484 void AppWindow::DidFirstVisuallyNonEmptyPaint() {
485 first_paint_complete_ = true; 485 first_paint_complete_ = true;
486 if (show_on_first_paint_) { 486 if (show_on_first_paint_) {
487 DCHECK(delayed_show_type_ == SHOW_ACTIVE || 487 DCHECK(delayed_show_type_ == SHOW_ACTIVE ||
488 delayed_show_type_ == SHOW_INACTIVE); 488 delayed_show_type_ == SHOW_INACTIVE);
489 Show(delayed_show_type_); 489 Show(delayed_show_type_);
490 } 490 }
491 } 491 }
492 492
493 void AppWindow::OnNativeClose() { 493 void AppWindow::OnNativeClose() {
494 AppWindowRegistry::Get(browser_context_)->RemoveAppWindow(this); 494 AppWindowRegistry::Get(browser_context_)->RemoveAppWindow(this);
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 region.bounds.x(), 1125 region.bounds.x(),
1126 region.bounds.y(), 1126 region.bounds.y(),
1127 region.bounds.right(), 1127 region.bounds.right(),
1128 region.bounds.bottom(), 1128 region.bounds.bottom(),
1129 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); 1129 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
1130 } 1130 }
1131 return sk_region; 1131 return sk_region;
1132 } 1132 }
1133 1133
1134 } // namespace apps 1134 } // namespace apps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698