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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_edit_view_win.h

Issue 155546: Merge 20395 - Fix a crash when clicking a popup entry while composing in the ... (Closed) Base URL: svn://chrome-svn/chrome/branches/193/src/
Patch Set: Created 11 years, 5 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 | « no previous file | chrome/browser/autocomplete/autocomplete_edit_view_win.cc » ('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/chrome/browser/autocomplete/autocomplete_edit_view_win.h:r69-2775
Merged /trunk/src/chrome/browser/autocomplete/autocomplete_edit_view_win.h:r20395
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 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_ 5 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_ 6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlapp.h> 9 #include <atlapp.h>
10 #include <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 // We need to know if the user triple-clicks, so track double click points 413 // We need to know if the user triple-clicks, so track double click points
414 // and times so we can see if subsequent clicks are actually triple clicks. 414 // and times so we can see if subsequent clicks are actually triple clicks.
415 bool tracking_double_click_; 415 bool tracking_double_click_;
416 CPoint double_click_point_; 416 CPoint double_click_point_;
417 DWORD double_click_time_; 417 DWORD double_click_time_;
418 418
419 // Used to discard unnecessary WM_MOUSEMOVE events after the first such 419 // Used to discard unnecessary WM_MOUSEMOVE events after the first such
420 // unnecessary event. See detailed comments in OnMouseMove(). 420 // unnecessary event. See detailed comments in OnMouseMove().
421 bool can_discard_mousemove_; 421 bool can_discard_mousemove_;
422 422
423 // Used to prevent IME message handling in the midst of updating the edit
424 // text. See comments where this is used.
425 bool ignore_ime_messages_;
426
423 // Variables for tracking state before and after a possible change. 427 // Variables for tracking state before and after a possible change.
424 std::wstring text_before_change_; 428 std::wstring text_before_change_;
425 CHARRANGE sel_before_change_; 429 CHARRANGE sel_before_change_;
426 430
427 // Set at the same time the model's original_* members are set, and valid in 431 // Set at the same time the model's original_* members are set, and valid in
428 // the same cases. 432 // the same cases.
429 CHARRANGE original_selection_; 433 CHARRANGE original_selection_;
430 434
431 // Holds the user's selection across focus changes. cpMin holds -1 when 435 // Holds the user's selection across focus changes. cpMin holds -1 when
432 // there is no saved selection. 436 // there is no saved selection.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 // striken-out when displaying an insecure scheme. 479 // striken-out when displaying an insecure scheme.
476 url_parse::Component insecure_scheme_component_; 480 url_parse::Component insecure_scheme_component_;
477 481
478 // Instance of accessibility information and handling. 482 // Instance of accessibility information and handling.
479 mutable CComPtr<IAccessible> autocomplete_accessibility_; 483 mutable CComPtr<IAccessible> autocomplete_accessibility_;
480 484
481 DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewWin); 485 DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewWin);
482 }; 486 };
483 487
484 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_ 488 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/autocomplete/autocomplete_edit_view_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698