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

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

Issue 7067015: An edit for SetText needs to be merged with previous edit for omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 6 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/textfield/textfield.h" 5 #include "views/controls/textfield/textfield.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gdk/gdkkeysyms.h> 8 #include <gdk/gdkkeysyms.h>
9 #endif 9 #endif
10 10
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 const ui::Range& range) { 282 const ui::Range& range) {
283 DCHECK(native_wrapper_); 283 DCHECK(native_wrapper_);
284 return native_wrapper_->ApplyTextStyle(style, range); 284 return native_wrapper_->ApplyTextStyle(style, range);
285 } 285 }
286 286
287 void Textfield::ClearAllTextStyles() { 287 void Textfield::ClearAllTextStyles() {
288 DCHECK(native_wrapper_); 288 DCHECK(native_wrapper_);
289 native_wrapper_->ClearAllTextStyles(); 289 native_wrapper_->ClearAllTextStyles();
290 } 290 }
291 291
292 void Textfield::ClearEditHistory() {
293 DCHECK(native_wrapper_);
294 native_wrapper_->ClearEditHistory();
295 }
296
292 void Textfield::SetAccessibleName(const string16& name) { 297 void Textfield::SetAccessibleName(const string16& name) {
293 accessible_name_ = name; 298 accessible_name_ = name;
294 } 299 }
295 300
296 //////////////////////////////////////////////////////////////////////////////// 301 ////////////////////////////////////////////////////////////////////////////////
297 // Textfield, View overrides: 302 // Textfield, View overrides:
298 303
299 void Textfield::Layout() { 304 void Textfield::Layout() {
300 if (native_wrapper_) { 305 if (native_wrapper_) {
301 native_wrapper_->GetView()->SetBoundsRect(GetLocalBounds()); 306 native_wrapper_->GetView()->SetBoundsRect(GetLocalBounds());
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 } 428 }
424 #endif 429 #endif
425 } 430 }
426 } 431 }
427 432
428 std::string Textfield::GetClassName() const { 433 std::string Textfield::GetClassName() const {
429 return kViewClassName; 434 return kViewClassName;
430 } 435 }
431 436
432 } // namespace views 437 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698