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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 674303002: Remove stub ScrollEndEffectController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash4_wallpaper
Patch Set: Created 6 years, 1 month 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 infobar_container_(NULL), 392 infobar_container_(NULL),
393 contents_web_view_(NULL), 393 contents_web_view_(NULL),
394 contents_container_(NULL), 394 contents_container_(NULL),
395 initialized_(false), 395 initialized_(false),
396 in_process_fullscreen_(false), 396 in_process_fullscreen_(false),
397 #if defined(OS_WIN) 397 #if defined(OS_WIN)
398 hung_window_detector_(&hung_plugin_action_), 398 hung_window_detector_(&hung_plugin_action_),
399 ticker_(0), 399 ticker_(0),
400 #endif 400 #endif
401 force_location_bar_focus_(false), 401 force_location_bar_focus_(false),
402 #if defined(OS_CHROMEOS)
403 scroll_end_effect_controller_(ScrollEndEffectController::Create()),
404 #endif
405 activate_modal_dialog_factory_(this) { 402 activate_modal_dialog_factory_(this) {
406 } 403 }
407 404
408 BrowserView::~BrowserView() { 405 BrowserView::~BrowserView() {
409 // All the tabs should have been destroyed already. If we were closed by the 406 // All the tabs should have been destroyed already. If we were closed by the
410 // OS with some tabs than the NativeBrowserFrame should have destroyed them. 407 // OS with some tabs than the NativeBrowserFrame should have destroyed them.
411 DCHECK_EQ(0, browser_->tab_strip_model()->count()); 408 DCHECK_EQ(0, browser_->tab_strip_model()->count());
412 409
413 // Immersive mode may need to reparent views before they are removed/deleted. 410 // Immersive mode may need to reparent views before they are removed/deleted.
414 immersive_mode_controller_.reset(); 411 immersive_mode_controller_.reset();
(...skipping 2016 matching lines...) Expand 10 before | Expand all | Expand 10 after
2431 gfx::Rect bounds(origin, anchor_view->size()); 2428 gfx::Rect bounds(origin, anchor_view->size());
2432 views::BubbleBorder::ArrowPaintType arrow_paint_type = 2429 views::BubbleBorder::ArrowPaintType arrow_paint_type =
2433 ShouldHideUIForFullscreen() ? views::BubbleBorder::PAINT_TRANSPARENT : 2430 ShouldHideUIForFullscreen() ? views::BubbleBorder::PAINT_TRANSPARENT :
2434 views::BubbleBorder::PAINT_NORMAL; 2431 views::BubbleBorder::PAINT_NORMAL;
2435 AvatarMenuBubbleView::ShowBubble(anchor_view, arrow, arrow_paint_type, 2432 AvatarMenuBubbleView::ShowBubble(anchor_view, arrow, arrow_paint_type,
2436 alignment, bounds, browser()); 2433 alignment, bounds, browser());
2437 ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE); 2434 ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
2438 } 2435 }
2439 } 2436 }
2440 2437
2441 void BrowserView::OverscrollUpdate(float delta_y) {
2442 if (scroll_end_effect_controller_)
2443 scroll_end_effect_controller_->OverscrollUpdate(delta_y);
2444 }
2445
2446 int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() { 2438 int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() {
2447 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED || 2439 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED ||
2448 !bookmark_bar_view_.get() || !bookmark_bar_view_->IsDetached()) { 2440 !bookmark_bar_view_.get() || !bookmark_bar_view_->IsDetached()) {
2449 return 0; 2441 return 0;
2450 } 2442 }
2451 // Don't use bookmark_bar_view_->height() which won't be the final height if 2443 // Don't use bookmark_bar_view_->height() which won't be the final height if
2452 // the bookmark bar is animating. 2444 // the bookmark bar is animating.
2453 return chrome::kNTPBookmarkBarHeight - 2445 return chrome::kNTPBookmarkBarHeight -
2454 bookmark_bar_view_->GetFullyDetachedToolbarOverlap(); 2446 bookmark_bar_view_->GetFullyDetachedToolbarOverlap();
2455 } 2447 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
2521 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { 2513 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
2522 gfx::Point icon_bottom( 2514 gfx::Point icon_bottom(
2523 toolbar_->location_bar()->GetLocationBarAnchorPoint()); 2515 toolbar_->location_bar()->GetLocationBarAnchorPoint());
2524 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); 2516 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
2525 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); 2517 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
2526 ConvertPointToTarget(infobar_container_, this, &infobar_top); 2518 ConvertPointToTarget(infobar_container_, this, &infobar_top);
2527 top_arrow_height = infobar_top.y() - icon_bottom.y(); 2519 top_arrow_height = infobar_top.y() - icon_bottom.y();
2528 } 2520 }
2529 return top_arrow_height; 2521 return top_arrow_height;
2530 } 2522 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/frame/scroll_end_effect_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698