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

Side by Side Diff: win8/metro_driver/ime/text_store.cc

Issue 1210013007: clang/win: Fix warnings to prepare for building without -Wno-reorder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clang-unsequenced
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "win8/metro_driver/ime/text_store.h" 5 #include "win8/metro_driver/ime/text_store.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/win/scoped_variant.h" 9 #include "base/win/scoped_variant.h"
10 #include "ui/base/win/atl_module.h" 10 #include "ui/base/win/atl_module.h"
11 #include "win8/metro_driver/ime/input_scope.h" 11 #include "win8/metro_driver/ime/input_scope.h"
12 #include "win8/metro_driver/ime/text_store_delegate.h" 12 #include "win8/metro_driver/ime/text_store_delegate.h"
13 13
14 namespace metro_driver { 14 namespace metro_driver {
15 namespace { 15 namespace {
16 16
17 // We support only one view. 17 // We support only one view.
18 const TsViewCookie kViewCookie = 1; 18 const TsViewCookie kViewCookie = 1;
19 19
20 } // namespace 20 } // namespace
21 21
22 TextStore::TextStore() 22 TextStore::TextStore()
23 : text_store_acp_sink_mask_(0), 23 : text_store_acp_sink_mask_(0),
24 window_handle_(NULL), 24 window_handle_(NULL),
25 delegate_(NULL),
26 committed_size_(0), 25 committed_size_(0),
27 selection_start_(0), 26 selection_start_(0),
28 selection_end_(0), 27 selection_end_(0),
29 edit_flag_(false), 28 edit_flag_(false),
30 current_lock_type_(0), 29 current_lock_type_(0),
31 category_manager_(NULL), 30 category_manager_(NULL),
32 display_attribute_manager_(NULL), 31 display_attribute_manager_(NULL),
33 input_scope_(NULL) { 32 input_scope_(NULL),
33 delegate_(NULL) {
34 } 34 }
35 35
36 TextStore::~TextStore() { 36 TextStore::~TextStore() {
37 } 37 }
38 38
39 // static 39 // static
40 scoped_refptr<TextStore> TextStore::Create( 40 scoped_refptr<TextStore> TextStore::Create(
41 HWND window_handle, 41 HWND window_handle,
42 const std::vector<InputScope>& input_scopes, 42 const std::vector<InputScope>& input_scopes,
43 TextStoreDelegate* delegate) { 43 TextStoreDelegate* delegate) {
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 885
886 bool TextStore::HasReadLock() const { 886 bool TextStore::HasReadLock() const {
887 return (current_lock_type_ & TS_LF_READ) == TS_LF_READ; 887 return (current_lock_type_ & TS_LF_READ) == TS_LF_READ;
888 } 888 }
889 889
890 bool TextStore::HasReadWriteLock() const { 890 bool TextStore::HasReadWriteLock() const {
891 return (current_lock_type_ & TS_LF_READWRITE) == TS_LF_READWRITE; 891 return (current_lock_type_ & TS_LF_READWRITE) == TS_LF_READWRITE;
892 } 892 }
893 893
894 } // namespace metro_driver 894 } // namespace metro_driver
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698