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

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

Issue 10868116: Pass result of blockage across content API when new tab blocked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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) 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // content::WebContentsDelegate overrides. 50 // content::WebContentsDelegate overrides.
51 virtual content::WebContents* OpenURLFromTab( 51 virtual content::WebContents* OpenURLFromTab(
52 content::WebContents* source, 52 content::WebContents* source,
53 const content::OpenURLParams& params) OVERRIDE; 53 const content::OpenURLParams& params) OVERRIDE;
54 virtual void NavigationStateChanged(const content::WebContents* source, 54 virtual void NavigationStateChanged(const content::WebContents* source,
55 unsigned changed_flags) OVERRIDE; 55 unsigned changed_flags) OVERRIDE;
56 virtual void AddNewContents(content::WebContents* source, 56 virtual void AddNewContents(content::WebContents* source,
57 content::WebContents* new_contents, 57 content::WebContents* new_contents,
58 WindowOpenDisposition disposition, 58 WindowOpenDisposition disposition,
59 const gfx::Rect& initial_pos, 59 const gfx::Rect& initial_pos,
60 bool user_gesture) OVERRIDE; 60 bool user_gesture,
61 bool* was_blocked) OVERRIDE;
61 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; 62 virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
62 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; 63 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
63 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; 64 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
64 virtual void CloseContents(content::WebContents* source) OVERRIDE; 65 virtual void CloseContents(content::WebContents* source) OVERRIDE;
65 virtual void MoveContents(content::WebContents* source, 66 virtual void MoveContents(content::WebContents* source,
66 const gfx::Rect& pos) OVERRIDE; 67 const gfx::Rect& pos) OVERRIDE;
67 virtual bool IsPopupOrPanel( 68 virtual bool IsPopupOrPanel(
68 const content::WebContents* source) const OVERRIDE; 69 const content::WebContents* source) const OVERRIDE;
69 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE; 70 virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
70 virtual bool IsApplication() const OVERRIDE; 71 virtual bool IsApplication() const OVERRIDE;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 base::WeakPtrFactory<PanelHost> weak_factory_; 112 base::WeakPtrFactory<PanelHost> weak_factory_;
112 113
113 scoped_ptr<PrefsTabHelper> prefs_tab_helper_; 114 scoped_ptr<PrefsTabHelper> prefs_tab_helper_;
114 scoped_ptr<FaviconTabHelper> favicon_tab_helper_; 115 scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
115 scoped_ptr<content::WebContents> web_contents_; 116 scoped_ptr<content::WebContents> web_contents_;
116 117
117 DISALLOW_COPY_AND_ASSIGN(PanelHost); 118 DISALLOW_COPY_AND_ASSIGN(PanelHost);
118 }; 119 };
119 120
120 #endif // CHROME_BROWSER_UI_PANELS_PANEL_HOST_H_ 121 #endif // CHROME_BROWSER_UI_PANELS_PANEL_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698