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

Side by Side Diff: content/shell/shell_win.cc

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: Fix mac build failure 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 | « content/shell/shell_mac.mm ('k') | no next file » | no next file with comments »
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 #include "content/shell/shell.h" 5 #include "content/shell/shell.h"
6 6
7 #include <commctrl.h> 7 #include <commctrl.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <io.h> 9 #include <io.h>
10 #include <windows.h> 10 #include <windows.h>
(...skipping 14 matching lines...) Expand all
25 const int kURLBarHeight = 24; 25 const int kURLBarHeight = 24;
26 26
27 const int kMaxURLLength = 1024; 27 const int kMaxURLLength = 1024;
28 28
29 } // namespace 29 } // namespace
30 30
31 namespace content { 31 namespace content {
32 32
33 HINSTANCE Shell::instance_handle_; 33 HINSTANCE Shell::instance_handle_;
34 34
35 void Shell::PlatformInitialize() { 35 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
36 _setmode(_fileno(stdout), _O_BINARY); 36 _setmode(_fileno(stdout), _O_BINARY);
37 _setmode(_fileno(stderr), _O_BINARY); 37 _setmode(_fileno(stderr), _O_BINARY);
38 INITCOMMONCONTROLSEX InitCtrlEx; 38 INITCOMMONCONTROLSEX InitCtrlEx;
39 InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX); 39 InitCtrlEx.dwSize = sizeof(INITCOMMONCONTROLSEX);
40 InitCtrlEx.dwICC = ICC_STANDARD_CLASSES; 40 InitCtrlEx.dwICC = ICC_STANDARD_CLASSES;
41 InitCommonControlsEx(&InitCtrlEx); 41 InitCommonControlsEx(&InitCtrlEx);
42 RegisterWindowClass(); 42 RegisterWindowClass();
43 } 43 }
44 44
45 void Shell::PlatformExit() { 45 void Shell::PlatformExit() {
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 276
277 return CallWindowProc(shell->default_edit_wnd_proc_, hwnd, message, wParam, 277 return CallWindowProc(shell->default_edit_wnd_proc_, hwnd, message, wParam,
278 lParam); 278 lParam);
279 } 279 }
280 280
281 void Shell::PlatformSetTitle(const string16& text) { 281 void Shell::PlatformSetTitle(const string16& text) {
282 ::SetWindowText(window_, text.c_str()); 282 ::SetWindowText(window_, text.c_str());
283 } 283 }
284 284
285 } // namespace content 285 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698