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

Side by Side Diff: apps/shell_window.h

Issue 134683004: Disabled pinch zooming in non-browser Aura windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « no previous file | apps/shell_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 APPS_SHELL_WINDOW_H_ 5 #ifndef APPS_SHELL_WINDOW_H_
6 #define APPS_SHELL_WINDOW_H_ 6 #define APPS_SHELL_WINDOW_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_icon_image.h" 10 #include "chrome/browser/extensions/extension_icon_image.h"
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 virtual bool PreHandleKeyboardEvent( 387 virtual bool PreHandleKeyboardEvent(
388 content::WebContents* source, 388 content::WebContents* source,
389 const content::NativeWebKeyboardEvent& event, 389 const content::NativeWebKeyboardEvent& event,
390 bool* is_keyboard_shortcut) OVERRIDE; 390 bool* is_keyboard_shortcut) OVERRIDE;
391 virtual void HandleKeyboardEvent( 391 virtual void HandleKeyboardEvent(
392 content::WebContents* source, 392 content::WebContents* source,
393 const content::NativeWebKeyboardEvent& event) OVERRIDE; 393 const content::NativeWebKeyboardEvent& event) OVERRIDE;
394 virtual void RequestToLockMouse(content::WebContents* web_contents, 394 virtual void RequestToLockMouse(content::WebContents* web_contents,
395 bool user_gesture, 395 bool user_gesture,
396 bool last_unlocked_by_target) OVERRIDE; 396 bool last_unlocked_by_target) OVERRIDE;
397 virtual bool PreHandleGestureEvent(
398 content::WebContents* source,
399 const blink::WebGestureEvent& event) OVERRIDE;
397 400
398 // content::WebContentsObserver implementation. 401 // content::WebContentsObserver implementation.
399 virtual void DidFirstVisuallyNonEmptyPaint(int32 page_id) OVERRIDE; 402 virtual void DidFirstVisuallyNonEmptyPaint(int32 page_id) OVERRIDE;
400 403
401 // content::NotificationObserver implementation. 404 // content::NotificationObserver implementation.
402 virtual void Observe(int type, 405 virtual void Observe(int type,
403 const content::NotificationSource& source, 406 const content::NotificationSource& source,
404 const content::NotificationDetails& details) OVERRIDE; 407 const content::NotificationDetails& details) OVERRIDE;
405 408
406 // web_modal::WebContentsModalDialogManagerDelegate implementation. 409 // web_modal::WebContentsModalDialogManagerDelegate implementation.
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 // reinstated when the window exits fullscreen and moves away from the 519 // reinstated when the window exits fullscreen and moves away from the
517 // taskbar. 520 // taskbar.
518 bool cached_always_on_top_; 521 bool cached_always_on_top_;
519 522
520 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 523 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
521 }; 524 };
522 525
523 } // namespace apps 526 } // namespace apps
524 527
525 #endif // APPS_SHELL_WINDOW_H_ 528 #endif // APPS_SHELL_WINDOW_H_
OLDNEW
« no previous file with comments | « no previous file | apps/shell_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698