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

Side by Side Diff: chrome/browser/ui/extensions/shell_window.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_EXTENSIONS_SHELL_WINDOW_H_ 5 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/extensions/extension_function_dispatcher.h" 9 #include "chrome/browser/extensions/extension_function_dispatcher.h"
10 #include "chrome/browser/sessions/session_id.h" 10 #include "chrome/browser/sessions/session_id.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 content::WebContents* web_contents, 129 content::WebContents* web_contents,
130 const content::MediaStreamRequest* request, 130 const content::MediaStreamRequest* request,
131 const content::MediaResponseCallback& callback) OVERRIDE; 131 const content::MediaResponseCallback& callback) OVERRIDE;
132 virtual content::WebContents* OpenURLFromTab( 132 virtual content::WebContents* OpenURLFromTab(
133 content::WebContents* source, 133 content::WebContents* source,
134 const content::OpenURLParams& params) OVERRIDE; 134 const content::OpenURLParams& params) OVERRIDE;
135 virtual void AddNewContents(content::WebContents* source, 135 virtual void AddNewContents(content::WebContents* source,
136 content::WebContents* new_contents, 136 content::WebContents* new_contents,
137 WindowOpenDisposition disposition, 137 WindowOpenDisposition disposition,
138 const gfx::Rect& initial_pos, 138 const gfx::Rect& initial_pos,
139 bool user_gesture) OVERRIDE; 139 bool user_gesture,
140 bool* was_blocked) OVERRIDE;
140 virtual void HandleKeyboardEvent( 141 virtual void HandleKeyboardEvent(
141 content::WebContents* source, 142 content::WebContents* source,
142 const content::NativeWebKeyboardEvent& event) OVERRIDE; 143 const content::NativeWebKeyboardEvent& event) OVERRIDE;
143 144
144 // content::NotificationObserver implementation. 145 // content::NotificationObserver implementation.
145 virtual void Observe(int type, 146 virtual void Observe(int type,
146 const content::NotificationSource& source, 147 const content::NotificationSource& source,
147 const content::NotificationDetails& details) OVERRIDE; 148 const content::NotificationDetails& details) OVERRIDE;
148 149
149 // ExtensionFunctionDispatcher::Delegate implementation. 150 // ExtensionFunctionDispatcher::Delegate implementation.
(...skipping 24 matching lines...) Expand all
174 content::WebContents* web_contents_; 175 content::WebContents* web_contents_;
175 content::NotificationRegistrar registrar_; 176 content::NotificationRegistrar registrar_;
176 ExtensionFunctionDispatcher extension_function_dispatcher_; 177 ExtensionFunctionDispatcher extension_function_dispatcher_;
177 178
178 scoped_ptr<NativeShellWindow> native_window_; 179 scoped_ptr<NativeShellWindow> native_window_;
179 180
180 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 181 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
181 }; 182 };
182 183
183 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 184 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698