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

Side by Side Diff: app/win/window_impl.cc

Issue 273017: Move native_widget_types and gtk_native_view_id_manager from base/gfx to... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « app/win/window_impl.h ('k') | base/base.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/base/window_impl.cc:r69-2775
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "app/win/window_impl.h"
6
5 #include <list> 7 #include <list>
6 8
7 #include "base/singleton.h" 9 #include "base/singleton.h"
8 #include "base/string_util.h" 10 #include "base/string_util.h"
9 #include "base/window_impl.h"
10 #include "base/win_util.h" 11 #include "base/win_util.h"
11 12
12 namespace base { 13 namespace app {
13 14
14 static const DWORD kWindowDefaultChildStyle = 15 static const DWORD kWindowDefaultChildStyle =
15 WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS; 16 WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
16 static const DWORD kWindowDefaultStyle = WS_OVERLAPPEDWINDOW; 17 static const DWORD kWindowDefaultStyle = WS_OVERLAPPEDWINDOW;
17 static const DWORD kWindowDefaultExStyle = 0; 18 static const DWORD kWindowDefaultExStyle = 0;
18 19
19 /////////////////////////////////////////////////////////////////////////////// 20 ///////////////////////////////////////////////////////////////////////////////
20 // WindowImpl class tracking. 21 // WindowImpl class tracking.
21 22
22 // static 23 // static
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 class_ex.lpszClassName = name.c_str(); 204 class_ex.lpszClassName = name.c_str();
204 class_ex.hIconSm = class_ex.hIcon; 205 class_ex.hIconSm = class_ex.hIcon;
205 ATOM atom = RegisterClassEx(&class_ex); 206 ATOM atom = RegisterClassEx(&class_ex);
206 DCHECK(atom); 207 DCHECK(atom);
207 208
208 Singleton<ClassRegistrar>()->RegisterClass(class_info, name, atom); 209 Singleton<ClassRegistrar>()->RegisterClass(class_info, name, atom);
209 210
210 return name; 211 return name;
211 } 212 }
212 213
213 } // namespace base 214 } // namespace app
OLDNEW
« no previous file with comments | « app/win/window_impl.h ('k') | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698