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

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

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 #include "ui/base/ime/chromeos/composition_text.h" 5 #include "ui/base/ime/chromeos/composition_text_chromeos.h"
6 6
7 namespace chromeos { 7 namespace chromeos {
8 8
9 CompositionText::CompositionText() 9 CompositionText::CompositionText()
10 : selection_start_(0), 10 : selection_start_(0),
11 selection_end_(0) {} 11 selection_end_(0) {}
12 12
13 CompositionText::~CompositionText() {} 13 CompositionText::~CompositionText() {}
14 14
15 void CompositionText::CopyFrom(const CompositionText& obj) { 15 void CompositionText::CopyFrom(const CompositionText& obj) {
16 text_ = obj.text(); 16 text_ = obj.text();
17 underline_attributes_ = obj.underline_attributes(); 17 underline_attributes_ = obj.underline_attributes();
18 selection_start_ = obj.selection_start(); 18 selection_start_ = obj.selection_start();
19 selection_end_ = obj.selection_end(); 19 selection_end_ = obj.selection_end();
20 } 20 }
21 21
22 } // namespace chromeos 22 } // namespace chromeos
OLDNEW
« no previous file with comments | « ui/base/ime/chromeos/composition_text_chromeos.h ('k') | ui/base/ime/chromeos/composition_text_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698