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

Side by Side Diff: views/controls/native_control.cc

Issue 214029: Adding focus to NaviteViewHost. (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 | « views/controls/native/native_view_host_wrapper.h ('k') | views/controls/native_control_gtk.h » ('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 (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "views/controls/native_control.h" 5 #include "views/controls/native_control.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlapp.h> 8 #include <atlapp.h>
9 #include <atlcrack.h> 9 #include <atlcrack.h>
10 #include <atlframe.h> 10 #include <atlframe.h>
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 } 279 }
280 280
281 HWND NativeControl::GetNativeControlHWND() { 281 HWND NativeControl::GetNativeControlHWND() {
282 if (container_) 282 if (container_)
283 return container_->GetControl(); 283 return container_->GetControl();
284 else 284 else
285 return NULL; 285 return NULL;
286 } 286 }
287 287
288 void NativeControl::NativeControlDestroyed() { 288 void NativeControl::NativeControlDestroyed() {
289 if (hwnd_view_)
290 hwnd_view_->Detach();
291 container_ = NULL; 289 container_ = NULL;
292 } 290 }
293 291
294 void NativeControl::SetVisible(bool f) { 292 void NativeControl::SetVisible(bool f) {
295 if (f != IsVisible()) { 293 if (f != IsVisible()) {
296 View::SetVisible(f); 294 View::SetVisible(f);
297 if (!f && container_) { 295 if (!f && container_) {
298 ::DestroyWindow(*container_); 296 ::DestroyWindow(*container_);
299 } else if (f && !container_) { 297 } else if (f && !container_) {
300 ValidateNativeControl(); 298 ValidateNativeControl();
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 reinterpret_cast<WNDPROC>(original_handler)); 376 reinterpret_cast<WNDPROC>(original_handler));
379 RemoveProp(window, kHandlerKey); 377 RemoveProp(window, kHandlerKey);
380 RemoveProp(window, kNativeControlKey); 378 RemoveProp(window, kNativeControlKey);
381 } 379 }
382 380
383 return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window, 381 return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
384 message, w_param, l_param); 382 message, w_param, l_param);
385 } 383 }
386 384
387 } // namespace views 385 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/native/native_view_host_wrapper.h ('k') | views/controls/native_control_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698