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: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 11 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h" 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 : OmniboxView(profile, controller, command_updater), 135 : OmniboxView(profile, controller, command_updater),
136 popup_window_mode_(popup_window_mode), 136 popup_window_mode_(popup_window_mode),
137 security_level_(ToolbarModel::NONE), 137 security_level_(ToolbarModel::NONE),
138 saved_selection_for_focus_change_(gfx::Range::InvalidRange()), 138 saved_selection_for_focus_change_(gfx::Range::InvalidRange()),
139 ime_composing_before_change_(false), 139 ime_composing_before_change_(false),
140 delete_at_end_pressed_(false), 140 delete_at_end_pressed_(false),
141 location_bar_view_(location_bar), 141 location_bar_view_(location_bar),
142 ime_candidate_window_open_(false), 142 ime_candidate_window_open_(false),
143 select_all_on_mouse_release_(false), 143 select_all_on_mouse_release_(false),
144 select_all_on_gesture_tap_(false) { 144 select_all_on_gesture_tap_(false) {
145 set_border(NULL); 145 SetBorder(views::Border::NullBorder());
146 set_id(VIEW_ID_OMNIBOX); 146 set_id(VIEW_ID_OMNIBOX);
147 SetFontList(font_list); 147 SetFontList(font_list);
148 } 148 }
149 149
150 OmniboxViewViews::~OmniboxViewViews() { 150 OmniboxViewViews::~OmniboxViewViews() {
151 #if defined(OS_CHROMEOS) 151 #if defined(OS_CHROMEOS)
152 chromeos::input_method::InputMethodManager::Get()-> 152 chromeos::input_method::InputMethodManager::Get()->
153 RemoveCandidateWindowObserver(this); 153 RemoveCandidateWindowObserver(this);
154 #endif 154 #endif
155 155
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
980 const base::string16 text(GetClipboardText()); 980 const base::string16 text(GetClipboardText());
981 if (!text.empty()) { 981 if (!text.empty()) {
982 // Record this paste, so we can do different behavior. 982 // Record this paste, so we can do different behavior.
983 model()->OnPaste(); 983 model()->OnPaste();
984 // Force a Paste operation to trigger the text_changed code in 984 // Force a Paste operation to trigger the text_changed code in
985 // OnAfterPossibleChange(), even if identical contents are pasted. 985 // OnAfterPossibleChange(), even if identical contents are pasted.
986 text_before_change_.clear(); 986 text_before_change_.clear();
987 InsertOrReplaceText(text); 987 InsertOrReplaceText(text);
988 } 988 }
989 } 989 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698