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

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

Issue 11614037: Call ShowRootWindow on NativeWindow's RootWindow to display the window. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Create RootWindowFirst Created 7 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
« no previous file with comments | « no previous file | content/shell/shell.cc » ('j') | content/shell/shell.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 4
5 #ifndef CONTENT_SHELL_SHELL_H_ 5 #ifndef CONTENT_SHELL_SHELL_H_
6 #define CONTENT_SHELL_SHELL_H_ 6 #define CONTENT_SHELL_SHELL_H_
7 7
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 typedef struct _GtkToolItem GtkToolItem; 26 typedef struct _GtkToolItem GtkToolItem;
27 #elif defined(OS_ANDROID) 27 #elif defined(OS_ANDROID)
28 #include "base/android/scoped_java_ref.h" 28 #include "base/android/scoped_java_ref.h"
29 #elif defined(USE_AURA) 29 #elif defined(USE_AURA)
30 namespace views { 30 namespace views {
31 class Widget; 31 class Widget;
32 class ViewsDelegate; 32 class ViewsDelegate;
33 } 33 }
34 namespace aura { 34 namespace aura {
35 class RootWindow;
35 namespace client { 36 namespace client {
36 class StackingClient; 37 class StackingClient;
37 } 38 }
38 } 39 }
39 #endif 40 #endif
40 41
41 class GURL; 42 class GURL;
43
44 // Content area size for newly created windows.
sky 2013/01/15 21:53:49 Why does this need to be here?
Nayan 2013/01/15 23:39:03 We use kTestWindowWidth and kTestWindowHeight in b
sky 2013/01/16 00:55:39 Ok, make sense.
45 static const int kTestWindowWidth = 800;
46 static const int kTestWindowHeight = 600;
47
42 namespace content { 48 namespace content {
43 49
44 class BrowserContext; 50 class BrowserContext;
45 class ShellJavaScriptDialogCreator; 51 class ShellJavaScriptDialogCreator;
46 class SiteInstance; 52 class SiteInstance;
47 class WebContents; 53 class WebContents;
48 54
49 // This represents one window of the Content Shell, i.e. all the UI including 55 // This represents one window of the Content Shell, i.e. all the UI including
50 // buttons and url bar, as well as the web content area. 56 // buttons and url bar, as well as the web content area.
51 class Shell : public WebContentsDelegate, 57 class Shell : public WebContentsDelegate,
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 240
235 int content_width_; 241 int content_width_;
236 int content_height_; 242 int content_height_;
237 #elif defined(OS_ANDROID) 243 #elif defined(OS_ANDROID)
238 base::android::ScopedJavaGlobalRef<jobject> java_object_; 244 base::android::ScopedJavaGlobalRef<jobject> java_object_;
239 #elif defined(USE_AURA) 245 #elif defined(USE_AURA)
240 static aura::client::StackingClient* stacking_client_; 246 static aura::client::StackingClient* stacking_client_;
241 static views::ViewsDelegate* views_delegate_; 247 static views::ViewsDelegate* views_delegate_;
242 248
243 views::Widget* window_widget_; 249 views::Widget* window_widget_;
250 static aura::RootWindow* CreateRootWindow(int, int);
sky 2013/01/15 21:53:49 methods are before members. Additionally name argu
Nayan 2013/01/15 23:39:03 Done.
244 #endif 251 #endif
245 252
246 bool headless_; 253 bool headless_;
247 254
248 // A container of all the open windows. We use a vector so we can keep track 255 // A container of all the open windows. We use a vector so we can keep track
249 // of ordering. 256 // of ordering.
250 static std::vector<Shell*> windows_; 257 static std::vector<Shell*> windows_;
251 258
252 static base::Callback<void(Shell*)> shell_created_callback_; 259 static base::Callback<void(Shell*)> shell_created_callback_;
253 260
254 // True if the destructur of Shell should post a quit closure on the current 261 // True if the destructur of Shell should post a quit closure on the current
255 // message loop if the destructed Shell object was the last one. 262 // message loop if the destructed Shell object was the last one.
256 static bool quit_message_loop_; 263 static bool quit_message_loop_;
257 }; 264 };
258 265
259 } // namespace content 266 } // namespace content
260 267
261 #endif // CONTENT_SHELL_SHELL_H_ 268 #endif // CONTENT_SHELL_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | content/shell/shell.cc » ('j') | content/shell/shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698