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

Side by Side Diff: ui/web_dialogs/web_dialog_web_contents_delegate.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 UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_ 5 #ifndef UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
6 #define UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_ 6 #define UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "content/public/browser/web_contents_delegate.h" 9 #include "content/public/browser/web_contents_delegate.h"
10 #include "ui/web_dialogs/web_dialogs_export.h" 10 #include "ui/web_dialogs/web_dialogs_export.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 const content::OpenURLParams& params) OVERRIDE; 58 const content::OpenURLParams& params) OVERRIDE;
59 59
60 virtual void AddNewContents(content::WebContents* source, 60 virtual void AddNewContents(content::WebContents* source,
61 content::WebContents* new_contents, 61 content::WebContents* new_contents,
62 WindowOpenDisposition disposition, 62 WindowOpenDisposition disposition,
63 const gfx::Rect& initial_pos, 63 const gfx::Rect& initial_pos,
64 bool user_gesture, 64 bool user_gesture,
65 bool* was_blocked) OVERRIDE; 65 bool* was_blocked) OVERRIDE;
66 virtual bool IsPopupOrPanel( 66 virtual bool IsPopupOrPanel(
67 const content::WebContents* source) const OVERRIDE; 67 const content::WebContents* source) const OVERRIDE;
68 68
jam 2014/01/23 01:34:47 nit: no blank line
69 virtual bool PreHandleGestureEvent(
70 content::WebContents* source,
71 const blink::WebGestureEvent& event) OVERRIDE;
72
69 private: 73 private:
70 // Weak pointer. Always an original profile. 74 // Weak pointer. Always an original profile.
71 content::BrowserContext* browser_context_; 75 content::BrowserContext* browser_context_;
72 76
73 scoped_ptr<WebContentsHandler> handler_; 77 scoped_ptr<WebContentsHandler> handler_;
74 78
75 DISALLOW_COPY_AND_ASSIGN(WebDialogWebContentsDelegate); 79 DISALLOW_COPY_AND_ASSIGN(WebDialogWebContentsDelegate);
76 }; 80 };
77 81
78 } // namespace ui 82 } // namespace ui
79 83
80 #endif // UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_ 84 #endif // UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698