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

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

Issue 1672103002: Pass the frame instead of the WebContents through RunBluetoothChooser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@doc-bubble-lifetimes
Patch Set: Fix Android Created 4 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
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 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 const WebContents* web_contents) const override; 129 const WebContents* web_contents) const override;
130 void RequestToLockMouse(WebContents* web_contents, 130 void RequestToLockMouse(WebContents* web_contents,
131 bool user_gesture, 131 bool user_gesture,
132 bool last_unlocked_by_target) override; 132 bool last_unlocked_by_target) override;
133 void CloseContents(WebContents* source) override; 133 void CloseContents(WebContents* source) override;
134 bool CanOverscrollContent() const override; 134 bool CanOverscrollContent() const override;
135 void DidNavigateMainFramePostCommit(WebContents* web_contents) override; 135 void DidNavigateMainFramePostCommit(WebContents* web_contents) override;
136 JavaScriptDialogManager* GetJavaScriptDialogManager( 136 JavaScriptDialogManager* GetJavaScriptDialogManager(
137 WebContents* source) override; 137 WebContents* source) override;
138 scoped_ptr<BluetoothChooser> RunBluetoothChooser( 138 scoped_ptr<BluetoothChooser> RunBluetoothChooser(
139 WebContents* web_contents, 139 RenderFrameHost* frame,
140 const BluetoothChooser::EventHandler& event_handler, 140 const BluetoothChooser::EventHandler& event_handler) override;
141 const url::Origin& origin) override;
142 #if defined(OS_MACOSX) 141 #if defined(OS_MACOSX)
143 void HandleKeyboardEvent(WebContents* source, 142 void HandleKeyboardEvent(WebContents* source,
144 const NativeWebKeyboardEvent& event) override; 143 const NativeWebKeyboardEvent& event) override;
145 #endif 144 #endif
146 bool AddMessageToConsole(WebContents* source, 145 bool AddMessageToConsole(WebContents* source,
147 int32_t level, 146 int32_t level,
148 const base::string16& message, 147 const base::string16& message,
149 int32_t line_no, 148 int32_t line_no,
150 const base::string16& source_id) override; 149 const base::string16& source_id) override;
151 void RendererUnresponsive(WebContents* source) override; 150 void RendererUnresponsive(WebContents* source) override;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 static base::Callback<void(Shell*)> shell_created_callback_; 255 static base::Callback<void(Shell*)> shell_created_callback_;
257 256
258 // True if the destructur of Shell should post a quit closure on the current 257 // True if the destructur of Shell should post a quit closure on the current
259 // message loop if the destructed Shell object was the last one. 258 // message loop if the destructed Shell object was the last one.
260 static bool quit_message_loop_; 259 static bool quit_message_loop_;
261 }; 260 };
262 261
263 } // namespace content 262 } // namespace content
264 263
265 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 264 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698