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

Side by Side Diff: content/shell/browser/shell.h

Issue 1153813003: Add user_gesture param to WebContentsDelegate::ActivateContents Base URL: https://chromium.googlesource.com/chromium/src.git@ug1_WebContentsImpl_Activate
Patch Set: Update callers Created 5 years, 7 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
« no previous file with comments | « content/public/browser/web_contents_delegate.h ('k') | content/shell/browser/shell.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 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_ 4 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_
5 #define CONTENT_SHELL_BROWSER_SHELL_H_ 5 #define CONTENT_SHELL_BROWSER_SHELL_H_
6 6
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 #if defined(OS_MACOSX) 138 #if defined(OS_MACOSX)
139 void HandleKeyboardEvent(WebContents* source, 139 void HandleKeyboardEvent(WebContents* source,
140 const NativeWebKeyboardEvent& event) override; 140 const NativeWebKeyboardEvent& event) override;
141 #endif 141 #endif
142 bool AddMessageToConsole(WebContents* source, 142 bool AddMessageToConsole(WebContents* source,
143 int32 level, 143 int32 level,
144 const base::string16& message, 144 const base::string16& message,
145 int32 line_no, 145 int32 line_no,
146 const base::string16& source_id) override; 146 const base::string16& source_id) override;
147 void RendererUnresponsive(WebContents* source) override; 147 void RendererUnresponsive(WebContents* source) override;
148 void ActivateContents(WebContents* contents) override; 148 void ActivateContents(WebContents* contents, bool user_gesture) override;
149 void DeactivateContents(WebContents* contents) override; 149 void DeactivateContents(WebContents* contents) override;
150 void WorkerCrashed(WebContents* source) override; 150 void WorkerCrashed(WebContents* source) override;
151 bool HandleContextMenu(const content::ContextMenuParams& params) override; 151 bool HandleContextMenu(const content::ContextMenuParams& params) override;
152 152
153 static gfx::Size GetShellDefaultSize(); 153 static gfx::Size GetShellDefaultSize();
154 154
155 private: 155 private:
156 enum UIControl { 156 enum UIControl {
157 BACK_BUTTON, 157 BACK_BUTTON,
158 FORWARD_BUTTON, 158 FORWARD_BUTTON,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 static base::Callback<void(Shell*)> shell_created_callback_; 251 static base::Callback<void(Shell*)> shell_created_callback_;
252 252
253 // True if the destructur of Shell should post a quit closure on the current 253 // True if the destructur of Shell should post a quit closure on the current
254 // message loop if the destructed Shell object was the last one. 254 // message loop if the destructed Shell object was the last one.
255 static bool quit_message_loop_; 255 static bool quit_message_loop_;
256 }; 256 };
257 257
258 } // namespace content 258 } // namespace content
259 259
260 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 260 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/public/browser/web_contents_delegate.h ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698