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

Side by Side Diff: chrome/browser/ui/views/password_generation_bubble_view.cc

Issue 135813002: Revert of Merge NativeTextfieldViews into views::Textfield. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/password_generation_bubble_view.h" 5 #include "chrome/browser/ui/views/password_generation_bubble_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/password_manager/password_manager.h" 8 #include "chrome/browser/password_manager/password_manager.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 gfx::Size GetImageSize() const; 61 gfx::Size GetImageSize() const;
62 62
63 views::Textfield* textfield_; 63 views::Textfield* textfield_;
64 views::ImageButton* image_button_; 64 views::ImageButton* image_button_;
65 }; 65 };
66 66
67 TextfieldWrapper::TextfieldWrapper(views::Textfield* textfield, 67 TextfieldWrapper::TextfieldWrapper(views::Textfield* textfield,
68 views::ImageButton* image_button) 68 views::ImageButton* image_button)
69 : textfield_(textfield), 69 : textfield_(textfield),
70 image_button_(image_button) { 70 image_button_(image_button) {
71 textfield_->RemoveBorder();
71 set_border(views::Border::CreateSolidBorder(kWrapperBorderSize, 72 set_border(views::Border::CreateSolidBorder(kWrapperBorderSize,
72 SK_ColorGRAY)); 73 SK_ColorGRAY));
73 74
74 AddChildView(textfield_); 75 AddChildView(textfield_);
75 AddChildView(image_button); 76 AddChildView(image_button);
76 } 77 }
77 78
78 TextfieldWrapper::~TextfieldWrapper() {} 79 TextfieldWrapper::~TextfieldWrapper() {}
79 80
80 void TextfieldWrapper::Layout() { 81 void TextfieldWrapper::Layout() {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 return false; 243 return false;
243 } 244 }
244 245
245 views::View* PasswordGenerationBubbleView::GetInitiallyFocusedView() { 246 views::View* PasswordGenerationBubbleView::GetInitiallyFocusedView() {
246 return textfield_; 247 return textfield_;
247 } 248 }
248 249
249 void PasswordGenerationBubbleView::WindowClosing() { 250 void PasswordGenerationBubbleView::WindowClosing() {
250 autofill::password_generation::LogUserActions(actions_); 251 autofill::password_generation::LogUserActions(actions_);
251 } 252 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698