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

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

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
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/timer/timer.h" 14 #include "base/timer/timer.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/devtools/devtools_window.h" 16 #include "chrome/browser/devtools/devtools_window.h"
17 #include "chrome/browser/signin/signin_header_helper.h" 17 #include "chrome/browser/signin/signin_header_helper.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/browser_window_testing_views.h" 20 #include "chrome/browser/ui/browser_window_testing_views.h"
21 #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" 21 #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h"
22 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 22 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
23 #include "chrome/browser/ui/views/frame/browser_frame.h" 23 #include "chrome/browser/ui/views/frame/browser_frame.h"
24 #include "chrome/browser/ui/views/frame/contents_web_view.h" 24 #include "chrome/browser/ui/views/frame/contents_web_view.h"
25 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 25 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
26 #include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h"
27 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" 26 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
28 #include "chrome/browser/ui/views/load_complete_listener.h" 27 #include "chrome/browser/ui/views/load_complete_listener.h"
29 #include "components/infobars/core/infobar_container.h" 28 #include "components/infobars/core/infobar_container.h"
30 #include "ui/base/accelerators/accelerator.h" 29 #include "ui/base/accelerators/accelerator.h"
31 #include "ui/base/models/simple_menu_model.h" 30 #include "ui/base/models/simple_menu_model.h"
32 #include "ui/gfx/native_widget_types.h" 31 #include "ui/gfx/native_widget_types.h"
33 #include "ui/views/controls/button/button.h" 32 #include "ui/views/controls/button/button.h"
34 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" 33 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
35 #include "ui/views/widget/widget_delegate.h" 34 #include "ui/views/widget/widget_delegate.h"
36 #include "ui/views/widget/widget_observer.h" 35 #include "ui/views/widget/widget_observer.h"
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 virtual void Paste() override; 355 virtual void Paste() override;
357 virtual WindowOpenDisposition GetDispositionForPopupBounds( 356 virtual WindowOpenDisposition GetDispositionForPopupBounds(
358 const gfx::Rect& bounds) override; 357 const gfx::Rect& bounds) override;
359 virtual FindBar* CreateFindBar() override; 358 virtual FindBar* CreateFindBar() override;
360 virtual web_modal::WebContentsModalDialogHost* 359 virtual web_modal::WebContentsModalDialogHost*
361 GetWebContentsModalDialogHost() override; 360 GetWebContentsModalDialogHost() override;
362 virtual void ShowAvatarBubble(content::WebContents* web_contents, 361 virtual void ShowAvatarBubble(content::WebContents* web_contents,
363 const gfx::Rect& rect) override; 362 const gfx::Rect& rect) override;
364 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, 363 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
365 const signin::ManageAccountsParams& manage_accounts_params) override; 364 const signin::ManageAccountsParams& manage_accounts_params) override;
366 virtual void OverscrollUpdate(float delta_y) override;
367 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; 365 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
368 virtual void ExecuteExtensionCommand( 366 virtual void ExecuteExtensionCommand(
369 const extensions::Extension* extension, 367 const extensions::Extension* extension,
370 const extensions::Command& command) override; 368 const extensions::Command& command) override;
371 369
372 // Overridden from BrowserWindowTesting: 370 // Overridden from BrowserWindowTesting:
373 virtual BookmarkBarView* GetBookmarkBarView() const override; 371 virtual BookmarkBarView* GetBookmarkBarView() const override;
374 virtual LocationBarView* GetLocationBarView() const override; 372 virtual LocationBarView* GetLocationBarView() const override;
375 virtual views::View* GetTabContentsContainerView() const override; 373 virtual views::View* GetTabContentsContainerView() const override;
376 virtual ToolbarView* GetToolbarView() const override; 374 virtual ToolbarView* GetToolbarView() const override;
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 699
702 // Used to measure the loading spinner animation rate. 700 // Used to measure the loading spinner animation rate.
703 base::TimeTicks last_animation_time_; 701 base::TimeTicks last_animation_time_;
704 702
705 // If this flag is set then SetFocusToLocationBar() will set focus to the 703 // If this flag is set then SetFocusToLocationBar() will set focus to the
706 // location bar even if the browser window is not active. 704 // location bar even if the browser window is not active.
707 bool force_location_bar_focus_; 705 bool force_location_bar_focus_;
708 706
709 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; 707 scoped_ptr<ImmersiveModeController> immersive_mode_controller_;
710 708
711 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
712
713 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 709 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
714 710
715 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 711 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
716 712
717 DISALLOW_COPY_AND_ASSIGN(BrowserView); 713 DISALLOW_COPY_AND_ASSIGN(BrowserView);
718 }; 714 };
719 715
720 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 716 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698