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

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: Attempt to fix views merge part 2 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 15 matching lines...) Expand all
26 #include "chrome/browser/sessions/session_id.h" 26 #include "chrome/browser/sessions/session_id.h"
27 #include "chrome/browser/sessions/tab_restore_service_observer.h" 27 #include "chrome/browser/sessions/tab_restore_service_observer.h"
28 #include "chrome/browser/sync/profile_sync_service_observer.h" 28 #include "chrome/browser/sync/profile_sync_service_observer.h"
29 #include "chrome/browser/tabs/tab_handler.h" 29 #include "chrome/browser/tabs/tab_handler.h"
30 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove 30 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove
31 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove 31 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove
32 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" 32 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"
33 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 33 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
34 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 34 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
35 #include "chrome/browser/ui/browser_navigator.h" 35 #include "chrome/browser/ui/browser_navigator.h"
36 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
36 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 37 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
37 #include "chrome/browser/ui/shell_dialogs.h" 38 #include "chrome/browser/ui/shell_dialogs.h"
38 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" 39 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
39 #include "chrome/browser/ui/toolbar/toolbar_model.h" 40 #include "chrome/browser/ui/toolbar/toolbar_model.h"
40 #include "chrome/common/content_settings_types.h" 41 #include "chrome/common/content_settings_types.h"
41 #include "chrome/common/extensions/extension_constants.h" 42 #include "chrome/common/extensions/extension_constants.h"
42 #include "content/browser/tab_contents/page_navigator.h" 43 #include "content/browser/tab_contents/page_navigator.h"
43 #include "content/browser/tab_contents/tab_contents_delegate.h" 44 #include "content/browser/tab_contents/tab_contents_delegate.h"
44 #include "content/common/notification_registrar.h" 45 #include "content/common/notification_registrar.h"
45 #include "content/common/page_transition_types.h" 46 #include "content/common/page_transition_types.h"
(...skipping 19 matching lines...) Expand all
65 namespace gfx { 66 namespace gfx {
66 class Point; 67 class Point;
67 } 68 }
68 69
69 struct ViewHostMsg_RunFileChooser_Params; 70 struct ViewHostMsg_RunFileChooser_Params;
70 71
71 class Browser : public TabHandlerDelegate, 72 class Browser : public TabHandlerDelegate,
72 public TabContentsDelegate, 73 public TabContentsDelegate,
73 public TabContentsWrapperDelegate, 74 public TabContentsWrapperDelegate,
74 public SearchEngineTabHelperDelegate, 75 public SearchEngineTabHelperDelegate,
76 public ConstrainedWindowTabHelperDelegate,
75 public BlockedContentTabHelperDelegate, 77 public BlockedContentTabHelperDelegate,
76 public BookmarkTabHelperDelegate, 78 public BookmarkTabHelperDelegate,
77 public PageNavigator, 79 public PageNavigator,
78 public CommandUpdater::CommandUpdaterDelegate, 80 public CommandUpdater::CommandUpdaterDelegate,
79 public NotificationObserver, 81 public NotificationObserver,
80 public SelectFileDialog::Listener, 82 public SelectFileDialog::Listener,
81 public TabRestoreServiceObserver, 83 public TabRestoreServiceObserver,
82 public ProfileSyncServiceObserver, 84 public ProfileSyncServiceObserver,
83 public InstantDelegate { 85 public InstantDelegate {
84 public: 86 public:
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 virtual void CloseContents(TabContents* source) OVERRIDE; 911 virtual void CloseContents(TabContents* source) OVERRIDE;
910 virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE; 912 virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE;
911 virtual void DetachContents(TabContents* source) OVERRIDE; 913 virtual void DetachContents(TabContents* source) OVERRIDE;
912 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE; 914 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE;
913 virtual bool CanReloadContents(TabContents* source) const; 915 virtual bool CanReloadContents(TabContents* source) const;
914 virtual void UpdateTargetURL(TabContents* source, int32 page_id, 916 virtual void UpdateTargetURL(TabContents* source, int32 page_id,
915 const GURL& url) OVERRIDE; 917 const GURL& url) OVERRIDE;
916 virtual void ContentsMouseEvent( 918 virtual void ContentsMouseEvent(
917 TabContents* source, const gfx::Point& location, bool motion) OVERRIDE; 919 TabContents* source, const gfx::Point& location, bool motion) OVERRIDE;
918 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; 920 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; 921 virtual void TabContentsFocused(TabContents* tab_content) OVERRIDE;
922 virtual bool TakeFocus(bool reverse) OVERRIDE; 922 virtual bool TakeFocus(bool reverse) OVERRIDE;
923 virtual bool IsApplication() const OVERRIDE; 923 virtual bool IsApplication() const OVERRIDE;
924 virtual void ConvertContentsToApplication(TabContents* source) OVERRIDE; 924 virtual void ConvertContentsToApplication(TabContents* source) OVERRIDE;
925 virtual void BeforeUnloadFired(TabContents* source, 925 virtual void BeforeUnloadFired(TabContents* source,
926 bool proceed, 926 bool proceed,
927 bool* proceed_to_fire_unload) OVERRIDE; 927 bool* proceed_to_fire_unload) OVERRIDE;
928 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; 928 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
929 virtual void RenderWidgetShowing() OVERRIDE; 929 virtual void RenderWidgetShowing() OVERRIDE;
930 virtual int GetExtraRenderViewHeight() const OVERRIDE; 930 virtual int GetExtraRenderViewHeight() const OVERRIDE;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 TabContentsWrapper* new_tab_contents); 1002 TabContentsWrapper* new_tab_contents);
1003 1003
1004 // Overridden from SearchEngineTabHelperDelegate: 1004 // Overridden from SearchEngineTabHelperDelegate:
1005 virtual void ConfirmSetDefaultSearchProvider( 1005 virtual void ConfirmSetDefaultSearchProvider(
1006 TabContents* tab_contents, 1006 TabContents* tab_contents,
1007 TemplateURL* template_url, 1007 TemplateURL* template_url,
1008 TemplateURLService* template_url_service) OVERRIDE; 1008 TemplateURLService* template_url_service) OVERRIDE;
1009 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url, 1009 virtual void ConfirmAddSearchProvider(const TemplateURL* template_url,
1010 Profile* profile) OVERRIDE; 1010 Profile* profile) OVERRIDE;
1011 1011
1012 // Overridden from ConstrainedWindowTabHelperDelegate:
1013 virtual void SetTabContentBlocked(TabContentsWrapper* contents,
1014 bool blocked) OVERRIDE;
1015
1012 // Overridden from BlockedContentTabHelperDelegate: 1016 // Overridden from BlockedContentTabHelperDelegate:
1013 virtual TabContentsWrapper* GetConstrainingContentsWrapper( 1017 virtual TabContentsWrapper* GetConstrainingContentsWrapper(
1014 TabContentsWrapper* source) OVERRIDE; 1018 TabContentsWrapper* source) OVERRIDE;
1015 1019
1016 // Overridden from BookmarkTabHelperDelegate: 1020 // Overridden from BookmarkTabHelperDelegate:
1017 virtual void URLStarredChanged(TabContentsWrapper* source, 1021 virtual void URLStarredChanged(TabContentsWrapper* source,
1018 bool starred) OVERRIDE; 1022 bool starred) OVERRIDE;
1019 1023
1020 // Overridden from SelectFileDialog::Listener: 1024 // Overridden from SelectFileDialog::Listener:
1021 virtual void FileSelected(const FilePath& path, int index, void* params); 1025 virtual void FileSelected(const FilePath& path, int index, void* params);
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1417 // True if the current tab entered fullscreen mode via webkitRequestFullScreen 1421 // True if the current tab entered fullscreen mode via webkitRequestFullScreen
1418 bool tab_caused_fullscreen_; 1422 bool tab_caused_fullscreen_;
1419 1423
1420 // True if the browser window has been shown at least once. 1424 // True if the browser window has been shown at least once.
1421 bool window_has_shown_; 1425 bool window_has_shown_;
1422 1426
1423 DISALLOW_COPY_AND_ASSIGN(Browser); 1427 DISALLOW_COPY_AND_ASSIGN(Browser);
1424 }; 1428 };
1425 1429
1426 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1430 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698