chrome/browser/ui/panels/panel_host.h - Issue 10978016: Remove two functions on WebContentsDelegate which didn't belong in content. They were only called f…

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

Issue 10978016: Remove two functions on WebContentsDelegate which didn't belong in content. They were only called f… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: nits and fixed prerender browser tests Created 8 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

« chrome/browser/instant/instant_loader.cc ('K') | « chrome/browser/ui/intents/web_intent_inline_disposition_delegate.cc ('k') | chrome/browser/ui/panels/panel_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_PANELS_PANEL_HOST_H_	5 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_HOST_H_

6 #define CHROME_BROWSER_UI_PANELS_PANEL_HOST_H_	6 #define CHROME_BROWSER_UI_PANELS_PANEL_HOST_H_

7	7

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "chrome/browser/extensions/extension_function_dispatcher.h"	10 #include "chrome/browser/extensions/extension_function_dispatcher.h"

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61 bool* was_blocked) OVERRIDE;	61 bool* was_blocked) OVERRIDE;

62 virtual void ActivateContents(content::WebContents* contents) OVERRIDE;	62 virtual void ActivateContents(content::WebContents* contents) OVERRIDE;

63 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;	63 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;

64 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;	64 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;

65 virtual void CloseContents(content::WebContents* source) OVERRIDE;	65 virtual void CloseContents(content::WebContents* source) OVERRIDE;

66 virtual void MoveContents(content::WebContents* source,	66 virtual void MoveContents(content::WebContents* source,

67 const gfx::Rect& pos) OVERRIDE;	67 const gfx::Rect& pos) OVERRIDE;

68 virtual bool IsPopupOrPanel(	68 virtual bool IsPopupOrPanel(

69 const content::WebContents* source) const OVERRIDE;	69 const content::WebContents* source) const OVERRIDE;

70 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;	70 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;

71 virtual bool IsApplication() const OVERRIDE;

72 virtual bool HandleContextMenu(	71 virtual bool HandleContextMenu(

73 const content::ContextMenuParams& params) OVERRIDE;	72 const content::ContextMenuParams& params) OVERRIDE;

74 virtual void HandleKeyboardEvent(	73 virtual void HandleKeyboardEvent(

75 content::WebContents* source,	74 content::WebContents* source,

76 const content::NativeWebKeyboardEvent& event) OVERRIDE;	75 const content::NativeWebKeyboardEvent& event) OVERRIDE;

77 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;	76 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;

78 virtual void ResizeDueToAutoResize(content::WebContents* web_contents,	77 virtual void ResizeDueToAutoResize(content::WebContents* web_contents,

79 const gfx::Size& new_size) OVERRIDE;	78 const gfx::Size& new_size) OVERRIDE;

80	79

81 // content::WebContentsObserver overrides.	80 // content::WebContentsObserver overrides.

(...skipping 30 matching lines...) Expand all Loading...
112 base::WeakPtrFactory<PanelHost> weak_factory_;	111 base::WeakPtrFactory<PanelHost> weak_factory_;

113	112

114 scoped_ptr<PrefsTabHelper> prefs_tab_helper_;	113 scoped_ptr<PrefsTabHelper> prefs_tab_helper_;

115 scoped_ptr<FaviconTabHelper> favicon_tab_helper_;	114 scoped_ptr<FaviconTabHelper> favicon_tab_helper_;

116 scoped_ptr<content::WebContents> web_contents_;	115 scoped_ptr<content::WebContents> web_contents_;

117	116

118 DISALLOW_COPY_AND_ASSIGN(PanelHost);	117 DISALLOW_COPY_AND_ASSIGN(PanelHost);

119 };	118 };

120	119

121 #endif // CHROME_BROWSER_UI_PANELS_PANEL_HOST_H_	120 #endif // CHROME_BROWSER_UI_PANELS_PANEL_HOST_H_

OLD	NEW