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

Side by Side Diff: chrome/browser/ui/browser.h

Issue 8614003: Add OVERRIDE to chrome/browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 // Overridden from PageNavigator: 757 // Overridden from PageNavigator:
758 // Deprecated. Please use the one-argument variant instead. 758 // Deprecated. Please use the one-argument variant instead.
759 // TODO(adriansc): Remove this method once refactoring changed all call sites. 759 // TODO(adriansc): Remove this method once refactoring changed all call sites.
760 virtual TabContents* OpenURL(const GURL& url, 760 virtual TabContents* OpenURL(const GURL& url,
761 const GURL& referrer, 761 const GURL& referrer,
762 WindowOpenDisposition disposition, 762 WindowOpenDisposition disposition,
763 content::PageTransition transition) OVERRIDE; 763 content::PageTransition transition) OVERRIDE;
764 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE; 764 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE;
765 765
766 // Overridden from CommandUpdater::CommandUpdaterDelegate: 766 // Overridden from CommandUpdater::CommandUpdaterDelegate:
767 virtual void ExecuteCommand(int id); 767 virtual void ExecuteCommand(int id) OVERRIDE;
768 768
769 // Overridden from TabRestoreServiceObserver: 769 // Overridden from TabRestoreServiceObserver:
770 virtual void TabRestoreServiceChanged(TabRestoreService* service); 770 virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE;
771 virtual void TabRestoreServiceDestroyed(TabRestoreService* service); 771 virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE;
772 772
773 // Centralized method for creating a TabContents, configuring and installing 773 // Centralized method for creating a TabContents, configuring and installing
774 // all its supporting objects and observers. 774 // all its supporting objects and observers.
775 static TabContentsWrapper* 775 static TabContentsWrapper*
776 TabContentsFactory(Profile* profile, 776 TabContentsFactory(Profile* profile,
777 SiteInstance* site_instance, 777 SiteInstance* site_instance,
778 int routing_id, 778 int routing_id,
779 const TabContents* base_tab_contents, 779 const TabContents* base_tab_contents,
780 SessionStorageNamespace* session_storage_namespace); 780 SessionStorageNamespace* session_storage_namespace);
781 781
782 // Overridden from TabHandlerDelegate: 782 // Overridden from TabHandlerDelegate:
783 virtual Profile* GetProfile() const; 783 virtual Profile* GetProfile() const OVERRIDE;
784 virtual Browser* AsBrowser(); 784 virtual Browser* AsBrowser() OVERRIDE;
785 785
786 // Overridden from TabStripModelDelegate: 786 // Overridden from TabStripModelDelegate:
787 virtual TabContentsWrapper* AddBlankTab(bool foreground); 787 virtual TabContentsWrapper* AddBlankTab(bool foreground);
788 virtual TabContentsWrapper* AddBlankTabAt(int index, bool foreground); 788 virtual TabContentsWrapper* AddBlankTabAt(int index, bool foreground);
789 virtual Browser* CreateNewStripWithContents( 789 virtual Browser* CreateNewStripWithContents(
790 TabContentsWrapper* detached_contents, 790 TabContentsWrapper* detached_contents,
791 const gfx::Rect& window_bounds, 791 const gfx::Rect& window_bounds,
792 const DockInfo& dock_info, 792 const DockInfo& dock_info,
793 bool maximize); 793 bool maximize);
794 virtual int GetDragActions() const; 794 virtual int GetDragActions() const;
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 WindowOpenDisposition disposition, 931 WindowOpenDisposition disposition,
932 const gfx::Rect& initial_pos, 932 const gfx::Rect& initial_pos,
933 bool user_gesture) OVERRIDE; 933 bool user_gesture) OVERRIDE;
934 virtual void ActivateContents(TabContents* contents) OVERRIDE; 934 virtual void ActivateContents(TabContents* contents) OVERRIDE;
935 virtual void DeactivateContents(TabContents* contents) OVERRIDE; 935 virtual void DeactivateContents(TabContents* contents) OVERRIDE;
936 virtual void LoadingStateChanged(TabContents* source) OVERRIDE; 936 virtual void LoadingStateChanged(TabContents* source) OVERRIDE;
937 virtual void CloseContents(TabContents* source) OVERRIDE; 937 virtual void CloseContents(TabContents* source) OVERRIDE;
938 virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE; 938 virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE;
939 virtual void DetachContents(TabContents* source) OVERRIDE; 939 virtual void DetachContents(TabContents* source) OVERRIDE;
940 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE; 940 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE;
941 virtual bool CanReloadContents(TabContents* source) const; 941 virtual bool CanReloadContents(TabContents* source) const OVERRIDE;
942 virtual void UpdateTargetURL(TabContents* source, int32 page_id, 942 virtual void UpdateTargetURL(TabContents* source, int32 page_id,
943 const GURL& url) OVERRIDE; 943 const GURL& url) OVERRIDE;
944 virtual void ContentsMouseEvent( 944 virtual void ContentsMouseEvent(
945 TabContents* source, const gfx::Point& location, bool motion) OVERRIDE; 945 TabContents* source, const gfx::Point& location, bool motion) OVERRIDE;
946 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; 946 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
947 virtual void TabContentsFocused(TabContents* tab_content) OVERRIDE; 947 virtual void TabContentsFocused(TabContents* tab_content) OVERRIDE;
948 virtual bool TakeFocus(bool reverse) OVERRIDE; 948 virtual bool TakeFocus(bool reverse) OVERRIDE;
949 virtual bool IsApplication() const OVERRIDE; 949 virtual bool IsApplication() const OVERRIDE;
950 virtual void ConvertContentsToApplication(TabContents* source) OVERRIDE; 950 virtual void ConvertContentsToApplication(TabContents* source) OVERRIDE;
951 virtual void BeforeUnloadFired(TabContents* source, 951 virtual void BeforeUnloadFired(TabContents* source,
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 1046
1047 // Overridden from BlockedContentTabHelperDelegate: 1047 // Overridden from BlockedContentTabHelperDelegate:
1048 virtual TabContentsWrapper* GetConstrainingContentsWrapper( 1048 virtual TabContentsWrapper* GetConstrainingContentsWrapper(
1049 TabContentsWrapper* source) OVERRIDE; 1049 TabContentsWrapper* source) OVERRIDE;
1050 1050
1051 // Overridden from BookmarkTabHelperDelegate: 1051 // Overridden from BookmarkTabHelperDelegate:
1052 virtual void URLStarredChanged(TabContentsWrapper* source, 1052 virtual void URLStarredChanged(TabContentsWrapper* source,
1053 bool starred) OVERRIDE; 1053 bool starred) OVERRIDE;
1054 1054
1055 // Overridden from SelectFileDialog::Listener: 1055 // Overridden from SelectFileDialog::Listener:
1056 virtual void FileSelected(const FilePath& path, int index, void* params); 1056 virtual void FileSelected(const FilePath& path,
1057 int index,
1058 void* params) OVERRIDE;
1057 1059
1058 // Overridden from content::NotificationObserver: 1060 // Overridden from content::NotificationObserver:
1059 virtual void Observe(int type, 1061 virtual void Observe(int type,
1060 const content::NotificationSource& source, 1062 const content::NotificationSource& source,
1061 const content::NotificationDetails& details); 1063 const content::NotificationDetails& details) OVERRIDE;
1062 1064
1063 // Overridden from ProfileSyncServiceObserver: 1065 // Overridden from ProfileSyncServiceObserver:
1064 virtual void OnStateChanged(); 1066 virtual void OnStateChanged() OVERRIDE;
1065 1067
1066 // Overriden from InstantDelegate: 1068 // Overriden from InstantDelegate:
1067 virtual void ShowInstant(TabContentsWrapper* preview_contents) OVERRIDE; 1069 virtual void ShowInstant(TabContentsWrapper* preview_contents) OVERRIDE;
1068 virtual void HideInstant() OVERRIDE; 1070 virtual void HideInstant() OVERRIDE;
1069 virtual void CommitInstant(TabContentsWrapper* preview_contents) OVERRIDE; 1071 virtual void CommitInstant(TabContentsWrapper* preview_contents) OVERRIDE;
1070 virtual void SetSuggestedText(const string16& text, 1072 virtual void SetSuggestedText(const string16& text,
1071 InstantCompleteBehavior behavior) OVERRIDE; 1073 InstantCompleteBehavior behavior) OVERRIDE;
1072 virtual gfx::Rect GetInstantBounds() OVERRIDE; 1074 virtual gfx::Rect GetInstantBounds() OVERRIDE;
1073 1075
1074 // Command and state updating /////////////////////////////////////////////// 1076 // Command and state updating ///////////////////////////////////////////////
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1425 1427
1426 scoped_refptr<FullscreenController> fullscreen_controller_; 1428 scoped_refptr<FullscreenController> fullscreen_controller_;
1427 1429
1428 // True if the browser window has been shown at least once. 1430 // True if the browser window has been shown at least once.
1429 bool window_has_shown_; 1431 bool window_has_shown_;
1430 1432
1431 DISALLOW_COPY_AND_ASSIGN(Browser); 1433 DISALLOW_COPY_AND_ASSIGN(Browser);
1432 }; 1434 };
1433 1435
1434 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1436 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/blocked_content/blocked_content_container.h ('k') | chrome/browser/ui/browser_navigator_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698