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

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, 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 | « ui/web_dialogs/DEPS ('k') | ui/web_dialogs/web_dialog_web_contents_delegate.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 (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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 // Calling this causes all following events sent from the 50 // Calling this causes all following events sent from the
51 // WebContents object to be ignored. It also makes all following 51 // WebContents object to be ignored. It also makes all following
52 // calls to browser_context() return NULL. 52 // calls to browser_context() return NULL.
53 void Detach(); 53 void Detach();
54 54
55 // content::WebContentsDelegate declarations. 55 // content::WebContentsDelegate declarations.
56 virtual content::WebContents* OpenURLFromTab( 56 virtual content::WebContents* OpenURLFromTab(
57 content::WebContents* source, 57 content::WebContents* source,
58 const content::OpenURLParams& params) OVERRIDE; 58 const content::OpenURLParams& params) OVERRIDE;
59
60 virtual void AddNewContents(content::WebContents* source, 59 virtual void AddNewContents(content::WebContents* source,
61 content::WebContents* new_contents, 60 content::WebContents* new_contents,
62 WindowOpenDisposition disposition, 61 WindowOpenDisposition disposition,
63 const gfx::Rect& initial_pos, 62 const gfx::Rect& initial_pos,
64 bool user_gesture, 63 bool user_gesture,
65 bool* was_blocked) OVERRIDE; 64 bool* was_blocked) OVERRIDE;
66 virtual bool IsPopupOrPanel( 65 virtual bool IsPopupOrPanel(
67 const content::WebContents* source) const OVERRIDE; 66 const content::WebContents* source) const OVERRIDE;
67 virtual bool PreHandleGestureEvent(
68 content::WebContents* source,
69 const blink::WebGestureEvent& event) OVERRIDE;
68 70
69 private: 71 private:
70 // Weak pointer. Always an original profile. 72 // Weak pointer. Always an original profile.
71 content::BrowserContext* browser_context_; 73 content::BrowserContext* browser_context_;
72 74
73 scoped_ptr<WebContentsHandler> handler_; 75 scoped_ptr<WebContentsHandler> handler_;
74 76
75 DISALLOW_COPY_AND_ASSIGN(WebDialogWebContentsDelegate); 77 DISALLOW_COPY_AND_ASSIGN(WebDialogWebContentsDelegate);
76 }; 78 };
77 79
78 } // namespace ui 80 } // namespace ui
79 81
80 #endif // UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_ 82 #endif // UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/web_dialogs/DEPS ('k') | ui/web_dialogs/web_dialog_web_contents_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698