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

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

Issue 22265009: Implement initial version of scroll end effect Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed build issue on windows and updated description. Created 7 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 | Annotate | Revision Log
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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 devtools_window_(NULL), 409 devtools_window_(NULL),
410 initialized_(false), 410 initialized_(false),
411 ignore_layout_(true), 411 ignore_layout_(true),
412 #if defined(OS_WIN) && !defined(USE_AURA) 412 #if defined(OS_WIN) && !defined(USE_AURA)
413 hung_window_detector_(&hung_plugin_action_), 413 hung_window_detector_(&hung_plugin_action_),
414 ticker_(0), 414 ticker_(0),
415 #endif 415 #endif
416 force_location_bar_focus_(false), 416 force_location_bar_focus_(false),
417 immersive_mode_controller_(chrome::CreateImmersiveModeController()), 417 immersive_mode_controller_(chrome::CreateImmersiveModeController()),
418 #if defined(OS_CHROMEOS) 418 #if defined(OS_CHROMEOS)
419 scroll_end_effect_controller_(ScrollEndEffectController::Create()), 419 scroll_end_effect_controller_(ScrollEndEffectController::Create(this)),
420 #endif 420 #endif
421 color_change_listener_(this), 421 color_change_listener_(this),
422 activate_modal_dialog_factory_(this) { 422 activate_modal_dialog_factory_(this) {
423 } 423 }
424 424
425 BrowserView::~BrowserView() { 425 BrowserView::~BrowserView() {
426 #if defined(USE_ASH) 426 #if defined(USE_ASH)
427 // Destroy BrowserLauncherItemController early on as it listens to the 427 // Destroy BrowserLauncherItemController early on as it listens to the
428 // TabstripModel, which is destroyed by the browser. 428 // TabstripModel, which is destroyed by the browser.
429 launcher_item_controller_.reset(); 429 launcher_item_controller_.reset();
(...skipping 2266 matching lines...) Expand 10 before | Expand all | Expand 10 after
2696 // The +1 in the next line creates a 1-px gap between icon and arrow tip. 2696 // The +1 in the next line creates a 1-px gap between icon and arrow tip.
2697 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() - 2697 gfx::Point icon_bottom(0, location_icon_view->GetImageBounds().bottom() -
2698 LocationBarView::kIconInternalPadding + 1); 2698 LocationBarView::kIconInternalPadding + 1);
2699 ConvertPointToTarget(location_icon_view, this, &icon_bottom); 2699 ConvertPointToTarget(location_icon_view, this, &icon_bottom);
2700 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); 2700 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
2701 ConvertPointToTarget(infobar_container_, this, &infobar_top); 2701 ConvertPointToTarget(infobar_container_, this, &infobar_top);
2702 top_arrow_height = infobar_top.y() - icon_bottom.y(); 2702 top_arrow_height = infobar_top.y() - icon_bottom.y();
2703 } 2703 }
2704 return top_arrow_height; 2704 return top_arrow_height;
2705 } 2705 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698