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

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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 bool enter_fullscreen) OVERRIDE; 115 bool enter_fullscreen) OVERRIDE;
116 virtual bool IsFullscreenForTabOrPending( 116 virtual bool IsFullscreenForTabOrPending(
117 const content::WebContents* source) const OVERRIDE; 117 const content::WebContents* source) const OVERRIDE;
118 virtual void RequestMediaAccessPermission( 118 virtual void RequestMediaAccessPermission(
119 content::WebContents* web_contents, 119 content::WebContents* web_contents,
120 const content::MediaStreamRequest* request, 120 const content::MediaStreamRequest* request,
121 const content::MediaResponseCallback& callback) OVERRIDE; 121 const content::MediaResponseCallback& callback) OVERRIDE;
122 virtual content::WebContents* OpenURLFromTab( 122 virtual content::WebContents* OpenURLFromTab(
123 content::WebContents* source, 123 content::WebContents* source,
124 const content::OpenURLParams& params) OVERRIDE; 124 const content::OpenURLParams& params) OVERRIDE;
125 virtual void AddNewContents(content::WebContents* source, 125 virtual bool AddNewContents(content::WebContents* source,
126 content::WebContents* new_contents, 126 content::WebContents* new_contents,
127 WindowOpenDisposition disposition, 127 WindowOpenDisposition disposition,
128 const gfx::Rect& initial_pos, 128 const gfx::Rect& initial_pos,
129 bool user_gesture) OVERRIDE; 129 bool user_gesture) OVERRIDE;
130 virtual void HandleKeyboardEvent( 130 virtual void HandleKeyboardEvent(
131 content::WebContents* source, 131 content::WebContents* source,
132 const content::NativeWebKeyboardEvent& event) OVERRIDE; 132 const content::NativeWebKeyboardEvent& event) OVERRIDE;
133 133
134 // content::NotificationObserver implementation. 134 // content::NotificationObserver implementation.
135 virtual void Observe(int type, 135 virtual void Observe(int type,
(...skipping 24 matching lines...) Expand all
160 content::WebContents* web_contents_; 160 content::WebContents* web_contents_;
161 content::NotificationRegistrar registrar_; 161 content::NotificationRegistrar registrar_;
162 ExtensionFunctionDispatcher extension_function_dispatcher_; 162 ExtensionFunctionDispatcher extension_function_dispatcher_;
163 163
164 scoped_ptr<NativeShellWindow> native_window_; 164 scoped_ptr<NativeShellWindow> native_window_;
165 165
166 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 166 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
167 }; 167 };
168 168
169 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 169 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698