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

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

Issue 7880003: content: Move constrained window code from TabContents to TabContentsWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac regression now that shutdown timing was changed for views. Created 9 years, 2 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 (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 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 virtual void CloseContents(TabContents* source) OVERRIDE; 909 virtual void CloseContents(TabContents* source) OVERRIDE;
910 virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE; 910 virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE;
911 virtual void DetachContents(TabContents* source) OVERRIDE; 911 virtual void DetachContents(TabContents* source) OVERRIDE;
912 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE; 912 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE;
913 virtual bool CanReloadContents(TabContents* source) const; 913 virtual bool CanReloadContents(TabContents* source) const;
914 virtual void UpdateTargetURL(TabContents* source, int32 page_id, 914 virtual void UpdateTargetURL(TabContents* source, int32 page_id,
915 const GURL& url) OVERRIDE; 915 const GURL& url) OVERRIDE;
916 virtual void ContentsMouseEvent( 916 virtual void ContentsMouseEvent(
917 TabContents* source, const gfx::Point& location, bool motion) OVERRIDE; 917 TabContents* source, const gfx::Point& location, bool motion) OVERRIDE;
918 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; 918 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
919 virtual void SetTabContentBlocked(TabContents* contents,
920 bool blocked) OVERRIDE;
921 virtual void TabContentsFocused(TabContents* tab_content) OVERRIDE; 919 virtual void TabContentsFocused(TabContents* tab_content) OVERRIDE;
922 virtual bool TakeFocus(bool reverse) OVERRIDE; 920 virtual bool TakeFocus(bool reverse) OVERRIDE;
923 virtual bool IsApplication() const OVERRIDE; 921 virtual bool IsApplication() const OVERRIDE;
924 virtual void ConvertContentsToApplication(TabContents* source) OVERRIDE; 922 virtual void ConvertContentsToApplication(TabContents* source) OVERRIDE;
925 virtual void BeforeUnloadFired(TabContents* source, 923 virtual void BeforeUnloadFired(TabContents* source,
926 bool proceed, 924 bool proceed,
927 bool* proceed_to_fire_unload) OVERRIDE; 925 bool* proceed_to_fire_unload) OVERRIDE;
928 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; 926 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
929 virtual void RenderWidgetShowing() OVERRIDE; 927 virtual void RenderWidgetShowing() OVERRIDE;
930 virtual int GetExtraRenderViewHeight() const OVERRIDE; 928 virtual int GetExtraRenderViewHeight() const OVERRIDE;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, 992 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source,
995 int32 page_id) OVERRIDE; 993 int32 page_id) OVERRIDE;
996 virtual void OnInstallApplication( 994 virtual void OnInstallApplication(
997 TabContentsWrapper* source, 995 TabContentsWrapper* source,
998 const WebApplicationInfo& app_info) OVERRIDE; 996 const WebApplicationInfo& app_info) OVERRIDE;
999 997
1000 // Note that the caller is responsible for deleting |old_tab_contents|. 998 // Note that the caller is responsible for deleting |old_tab_contents|.
1001 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents, 999 virtual void SwapTabContents(TabContentsWrapper* old_tab_contents,
1002 TabContentsWrapper* new_tab_contents); 1000 TabContentsWrapper* new_tab_contents);
1003 1001
1002 virtual void SetTabContentBlocked(TabContentsWrapper* contents,
1003 bool blocked) OVERRIDE;
1004
1004 // Overridden from SearchEngineTabHelperDelegate: 1005 // Overridden from SearchEngineTabHelperDelegate:
1005 virtual void ConfirmSetDefaultSearchProvider( 1006 virtual void ConfirmSetDefaultSearchProvider(
1006 TabContents* tab_contents, 1007 TabContents* tab_contents,
1007 TemplateURL* template_url, 1008 TemplateURL* template_url,
1008 TemplateURLService* template_url_service) OVERRIDE; 1009 TemplateURLService* template_url_service) OVERRIDE;
1009 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, 1010 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url,
1010 Profile* profile) OVERRIDE; 1011 Profile* profile) OVERRIDE;
1011 1012
1012 // Overridden from BlockedContentTabHelperDelegate: 1013 // Overridden from BlockedContentTabHelperDelegate:
1013 virtual TabContentsWrapper* GetConstrainingContentsWrapper( 1014 virtual TabContentsWrapper* GetConstrainingContentsWrapper(
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
1417 // True if the current tab entered fullscreen mode via webkitRequestFullScreen 1418 // True if the current tab entered fullscreen mode via webkitRequestFullScreen
1418 bool tab_caused_fullscreen_; 1419 bool tab_caused_fullscreen_;
1419 1420
1420 // True if the browser window has been shown at least once. 1421 // True if the browser window has been shown at least once.
1421 bool window_has_shown_; 1422 bool window_has_shown_;
1422 1423
1423 DISALLOW_COPY_AND_ASSIGN(Browser); 1424 DISALLOW_COPY_AND_ASSIGN(Browser);
1424 }; 1425 };
1425 1426
1426 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1427 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698