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

Side by Side Diff: chrome/browser/ui/browser.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, 11 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 class FullscreenController; 55 class FullscreenController;
56 class PrefService; 56 class PrefService;
57 class Profile; 57 class Profile;
58 class SearchDelegate; 58 class SearchDelegate;
59 class SearchModel; 59 class SearchModel;
60 class StatusBubble; 60 class StatusBubble;
61 class TabStripModel; 61 class TabStripModel;
62 class TabStripModelDelegate; 62 class TabStripModelDelegate;
63 struct WebApplicationInfo; 63 struct WebApplicationInfo;
64 64
65 namespace blink {
66 class WebGestureEvent;
67 }
68
65 namespace chrome { 69 namespace chrome {
66 class BrowserCommandController; 70 class BrowserCommandController;
67 class FastUnloadController; 71 class FastUnloadController;
68 class UnloadController; 72 class UnloadController;
69 class ValidationMessageBubble; 73 class ValidationMessageBubble;
70 } 74 }
71 75
72 namespace content { 76 namespace content {
73 class NavigationController; 77 class NavigationController;
74 class PageState; 78 class PageState;
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 438
435 // Overridden from content::WebContentsDelegate: 439 // Overridden from content::WebContentsDelegate:
436 virtual bool CanOverscrollContent() const OVERRIDE; 440 virtual bool CanOverscrollContent() const OVERRIDE;
437 virtual bool PreHandleKeyboardEvent( 441 virtual bool PreHandleKeyboardEvent(
438 content::WebContents* source, 442 content::WebContents* source,
439 const content::NativeWebKeyboardEvent& event, 443 const content::NativeWebKeyboardEvent& event,
440 bool* is_keyboard_shortcut) OVERRIDE; 444 bool* is_keyboard_shortcut) OVERRIDE;
441 virtual void HandleKeyboardEvent( 445 virtual void HandleKeyboardEvent(
442 content::WebContents* source, 446 content::WebContents* source,
443 const content::NativeWebKeyboardEvent& event) OVERRIDE; 447 const content::NativeWebKeyboardEvent& event) OVERRIDE;
448 virtual bool PreHandleGestureEvent(
449 content::WebContents* source,
450 const blink::WebGestureEvent& event) OVERRIDE;
444 virtual void OverscrollUpdate(int delta_y) OVERRIDE; 451 virtual void OverscrollUpdate(int delta_y) OVERRIDE;
445 virtual void ShowValidationMessage(content::WebContents* web_contents, 452 virtual void ShowValidationMessage(content::WebContents* web_contents,
446 const gfx::Rect& anchor_in_root_view, 453 const gfx::Rect& anchor_in_root_view,
447 const base::string16& main_text, 454 const base::string16& main_text,
448 const base::string16& sub_text) OVERRIDE; 455 const base::string16& sub_text) OVERRIDE;
449 virtual void HideValidationMessage( 456 virtual void HideValidationMessage(
450 content::WebContents* web_contents) OVERRIDE; 457 content::WebContents* web_contents) OVERRIDE;
451 virtual void MoveValidationMessage( 458 virtual void MoveValidationMessage(
452 content::WebContents* web_contents, 459 content::WebContents* web_contents,
453 const gfx::Rect& anchor_in_root_view) OVERRIDE; 460 const gfx::Rect& anchor_in_root_view) OVERRIDE;
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 base::WeakPtrFactory<Browser> weak_factory_; 934 base::WeakPtrFactory<Browser> weak_factory_;
928 935
929 scoped_ptr<BrowserLanguageStateObserver> language_state_observer_; 936 scoped_ptr<BrowserLanguageStateObserver> language_state_observer_;
930 937
931 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; 938 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_;
932 939
933 DISALLOW_COPY_AND_ASSIGN(Browser); 940 DISALLOW_COPY_AND_ASSIGN(Browser);
934 }; 941 };
935 942
936 #endif // CHROME_BROWSER_UI_BROWSER_H_ 943 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | content/public/browser/web_contents_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698