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

Side by Side Diff: chrome/browser/ui/extensions/shell_window.h

Issue 11413131: Enable Pointer Lock for packaged apps using ShellWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: PermissionMessages test fixed; added kPointerLock to skips Created 8 years 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/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 const content::OpenURLParams& params) OVERRIDE; 149 const content::OpenURLParams& params) OVERRIDE;
150 virtual void AddNewContents(content::WebContents* source, 150 virtual void AddNewContents(content::WebContents* source,
151 content::WebContents* new_contents, 151 content::WebContents* new_contents,
152 WindowOpenDisposition disposition, 152 WindowOpenDisposition disposition,
153 const gfx::Rect& initial_pos, 153 const gfx::Rect& initial_pos,
154 bool user_gesture, 154 bool user_gesture,
155 bool* was_blocked) OVERRIDE; 155 bool* was_blocked) OVERRIDE;
156 virtual void HandleKeyboardEvent( 156 virtual void HandleKeyboardEvent(
157 content::WebContents* source, 157 content::WebContents* source,
158 const content::NativeWebKeyboardEvent& event) OVERRIDE; 158 const content::NativeWebKeyboardEvent& event) OVERRIDE;
159 virtual void RequestToLockMouse(content::WebContents* web_contents,
160 bool user_gesture,
161 bool last_unlocked_by_target) OVERRIDE;
159 162
160 // content::NotificationObserver implementation. 163 // content::NotificationObserver implementation.
161 virtual void Observe(int type, 164 virtual void Observe(int type,
162 const content::NotificationSource& source, 165 const content::NotificationSource& source,
163 const content::NotificationDetails& details) OVERRIDE; 166 const content::NotificationDetails& details) OVERRIDE;
164 167
165 // ExtensionFunctionDispatcher::Delegate implementation. 168 // ExtensionFunctionDispatcher::Delegate implementation.
166 virtual extensions::WindowController* GetExtensionWindowController() const 169 virtual extensions::WindowController* GetExtensionWindowController() const
167 OVERRIDE; 170 OVERRIDE;
168 virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE; 171 virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 213
211 // Used for loading app_icon_. 214 // Used for loading app_icon_.
212 scoped_ptr<ImageLoadingTracker> app_icon_loader_; 215 scoped_ptr<ImageLoadingTracker> app_icon_loader_;
213 216
214 scoped_ptr<NativeAppWindow> native_app_window_; 217 scoped_ptr<NativeAppWindow> native_app_window_;
215 218
216 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 219 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
217 }; 220 };
218 221
219 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 222 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_pointer_lock_apitest.cc ('k') | chrome/browser/ui/extensions/shell_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698