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

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

Issue 2658473002: Refactor BluetoothAllowedDevicesMap (Closed)
Patch Set: set --similarity=20 when did git cl upload Created 3 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
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 <list>
9 #include <memory> 10 #include <memory>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/callback_forward.h" 13 #include "base/callback_forward.h"
13 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
14 #include "base/strings/string_piece.h" 15 #include "base/strings/string_piece.h"
15 #include "build/build_config.h" 16 #include "build/build_config.h"
16 #include "content/public/browser/web_contents_delegate.h" 17 #include "content/public/browser/web_contents_delegate.h"
17 #include "content/public/browser/web_contents_observer.h" 18 #include "content/public/browser/web_contents_observer.h"
18 #include "ipc/ipc_channel.h" 19 #include "ipc/ipc_channel.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 bool user_gesture, 148 bool user_gesture,
148 bool last_unlocked_by_target) override; 149 bool last_unlocked_by_target) override;
149 void CloseContents(WebContents* source) override; 150 void CloseContents(WebContents* source) override;
150 bool CanOverscrollContent() const override; 151 bool CanOverscrollContent() const override;
151 void DidNavigateMainFramePostCommit(WebContents* web_contents) override; 152 void DidNavigateMainFramePostCommit(WebContents* web_contents) override;
152 JavaScriptDialogManager* GetJavaScriptDialogManager( 153 JavaScriptDialogManager* GetJavaScriptDialogManager(
153 WebContents* source) override; 154 WebContents* source) override;
154 std::unique_ptr<BluetoothChooser> RunBluetoothChooser( 155 std::unique_ptr<BluetoothChooser> RunBluetoothChooser(
155 RenderFrameHost* frame, 156 RenderFrameHost* frame,
156 const BluetoothChooser::EventHandler& event_handler) override; 157 const BluetoothChooser::EventHandler& event_handler) override;
158 BluetoothAllowedDevicesMapBase* GetBluetoothDevicesMap(
159 RenderFrameHost* frame) override;
157 #if defined(OS_MACOSX) 160 #if defined(OS_MACOSX)
158 void HandleKeyboardEvent(WebContents* source, 161 void HandleKeyboardEvent(WebContents* source,
159 const NativeWebKeyboardEvent& event) override; 162 const NativeWebKeyboardEvent& event) override;
160 #endif 163 #endif
161 bool DidAddMessageToConsole(WebContents* source, 164 bool DidAddMessageToConsole(WebContents* source,
162 int32_t level, 165 int32_t level,
163 const base::string16& message, 166 const base::string16& message,
164 int32_t line_no, 167 int32_t line_no,
165 const base::string16& source_id) override; 168 const base::string16& source_id) override;
166 void RendererUnresponsive( 169 void RendererUnresponsive(
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 237
235 void OnDevToolsWebContentsDestroyed(); 238 void OnDevToolsWebContentsDestroyed();
236 239
237 std::unique_ptr<ShellJavaScriptDialogManager> dialog_manager_; 240 std::unique_ptr<ShellJavaScriptDialogManager> dialog_manager_;
238 241
239 std::unique_ptr<WebContents> web_contents_; 242 std::unique_ptr<WebContents> web_contents_;
240 243
241 std::unique_ptr<DevToolsWebContentsObserver> devtools_observer_; 244 std::unique_ptr<DevToolsWebContentsObserver> devtools_observer_;
242 ShellDevToolsFrontend* devtools_frontend_; 245 ShellDevToolsFrontend* devtools_frontend_;
243 246
247 std::list<std::unique_ptr<BluetoothAllowedDevicesMapBase>>
248 bluetooth_allowed_devices_maps_;
249
244 bool is_fullscreen_; 250 bool is_fullscreen_;
245 251
246 gfx::NativeWindow window_; 252 gfx::NativeWindow window_;
247 #if defined(OS_MACOSX) 253 #if defined(OS_MACOSX)
248 NSTextField* url_edit_view_; 254 NSTextField* url_edit_view_;
249 #endif 255 #endif
250 256
251 gfx::Size content_size_; 257 gfx::Size content_size_;
252 258
253 #if defined(OS_ANDROID) 259 #if defined(OS_ANDROID)
(...skipping 22 matching lines...) Expand all
276 static base::Callback<void(Shell*)> shell_created_callback_; 282 static base::Callback<void(Shell*)> shell_created_callback_;
277 283
278 // True if the destructur of Shell should post a quit closure on the current 284 // True if the destructur of Shell should post a quit closure on the current
279 // message loop if the destructed Shell object was the last one. 285 // message loop if the destructed Shell object was the last one.
280 static bool quit_message_loop_; 286 static bool quit_message_loop_;
281 }; 287 };
282 288
283 } // namespace content 289 } // namespace content
284 290
285 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 291 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698