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

Side by Side Diff: ui/base/ime/chromeos/composition_text_chromeos.h

Issue 1149223004: Avoid basename conflict in text_composition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_ 5 #ifndef UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_CHROMEOS_H_
6 #define UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_ 6 #define UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_CHROMEOS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "ui/base/ime/ui_base_ime_export.h" 13 #include "ui/base/ime/ui_base_ime_export.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 16
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 base::string16 text_; 60 base::string16 text_;
61 std::vector<UnderlineAttribute> underline_attributes_; 61 std::vector<UnderlineAttribute> underline_attributes_;
62 uint32 selection_start_; 62 uint32 selection_start_;
63 uint32 selection_end_; 63 uint32 selection_end_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(CompositionText); 65 DISALLOW_COPY_AND_ASSIGN(CompositionText);
66 }; 66 };
67 67
68 } // namespace chromeos 68 } // namespace chromeos
69 69
70 #endif // UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_ 70 #endif // UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ui/base/ime/chromeos/composition_text.cc ('k') | ui/base/ime/chromeos/composition_text_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698