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

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

Issue 1325953002: Add functions to let tests read and control the Bluetooth chooser state. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Add a forgotten semicolon. :-/ Created 5 years, 3 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 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 blink::WebDisplayMode GetDisplayMode( 128 blink::WebDisplayMode GetDisplayMode(
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(
139 WebContents* web_contents,
140 const BluetoothChooser::EventHandler& event_handler,
141 const GURL& origin) override;
138 #if defined(OS_MACOSX) 142 #if defined(OS_MACOSX)
139 void HandleKeyboardEvent(WebContents* source, 143 void HandleKeyboardEvent(WebContents* source,
140 const NativeWebKeyboardEvent& event) override; 144 const NativeWebKeyboardEvent& event) override;
141 #endif 145 #endif
142 bool AddMessageToConsole(WebContents* source, 146 bool AddMessageToConsole(WebContents* source,
143 int32 level, 147 int32 level,
144 const base::string16& message, 148 const base::string16& message,
145 int32 line_no, 149 int32 line_no,
146 const base::string16& source_id) override; 150 const base::string16& source_id) override;
147 void RendererUnresponsive(WebContents* source) override; 151 void RendererUnresponsive(WebContents* source) override;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 static base::Callback<void(Shell*)> shell_created_callback_; 254 static base::Callback<void(Shell*)> shell_created_callback_;
251 255
252 // True if the destructur of Shell should post a quit closure on the current 256 // True if the destructur of Shell should post a quit closure on the current
253 // message loop if the destructed Shell object was the last one. 257 // message loop if the destructed Shell object was the last one.
254 static bool quit_message_loop_; 258 static bool quit_message_loop_;
255 }; 259 };
256 260
257 } // namespace content 261 } // namespace content
258 262
259 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 263 #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