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

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

Issue 1440683003: gfx: Remove gfx::NativeEditView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_; 218 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_;
219 219
220 scoped_ptr<WebContents> web_contents_; 220 scoped_ptr<WebContents> web_contents_;
221 221
222 scoped_ptr<DevToolsWebContentsObserver> devtools_observer_; 222 scoped_ptr<DevToolsWebContentsObserver> devtools_observer_;
223 ShellDevToolsFrontend* devtools_frontend_; 223 ShellDevToolsFrontend* devtools_frontend_;
224 224
225 bool is_fullscreen_; 225 bool is_fullscreen_;
226 226
227 gfx::NativeWindow window_; 227 gfx::NativeWindow window_;
228 gfx::NativeEditView url_edit_view_; 228 #if defined(OS_MACOSX)
229 NSTextField* url_edit_view_;
230 #endif
229 231
230 gfx::Size content_size_; 232 gfx::Size content_size_;
231 233
232 #if defined(OS_ANDROID) 234 #if defined(OS_ANDROID)
233 base::android::ScopedJavaGlobalRef<jobject> java_object_; 235 base::android::ScopedJavaGlobalRef<jobject> java_object_;
234 #elif defined(USE_AURA) 236 #elif defined(USE_AURA)
235 #if defined(OS_CHROMEOS) 237 #if defined(OS_CHROMEOS)
236 static wm::WMTestHelper* wm_test_helper_; 238 static wm::WMTestHelper* wm_test_helper_;
237 static gfx::Screen* test_screen_; 239 static gfx::Screen* test_screen_;
238 #endif 240 #endif
(...skipping 14 matching lines...) Expand all
253 static base::Callback<void(Shell*)> shell_created_callback_; 255 static base::Callback<void(Shell*)> shell_created_callback_;
254 256
255 // 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
256 // message loop if the destructed Shell object was the last one. 258 // message loop if the destructed Shell object was the last one.
257 static bool quit_message_loop_; 259 static bool quit_message_loop_;
258 }; 260 };
259 261
260 } // namespace content 262 } // namespace content
261 263
262 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 264 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698