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

Side by Side Diff: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc

Issue 8620002: s/Move/Stack/ in names of stacking-related methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a test Created 9 years, 1 month 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 | « no previous file | chrome/browser/ui/views/hung_renderer_view.cc » ('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) 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 "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view. h" 5 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view. h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <commctrl.h> 8 #include <commctrl.h>
9 #include <dwmapi.h> 9 #include <dwmapi.h>
10 #include <objidl.h> 10 #include <objidl.h>
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 if (popup_ == NULL) { 340 if (popup_ == NULL) {
341 // If the popup is currently closed, we need to create it. 341 // If the popup is currently closed, we need to create it.
342 popup_ = (new AutocompletePopupWidget)->AsWeakPtr(); 342 popup_ = (new AutocompletePopupWidget)->AsWeakPtr();
343 views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); 343 views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
344 params.can_activate = false; 344 params.can_activate = false;
345 params.transparent = true; 345 params.transparent = true;
346 params.parent_widget = location_bar_->GetWidget(); 346 params.parent_widget = location_bar_->GetWidget();
347 params.bounds = GetPopupBounds(); 347 params.bounds = GetPopupBounds();
348 popup_->Init(params); 348 popup_->Init(params);
349 popup_->SetContentsView(this); 349 popup_->SetContentsView(this);
350 popup_->MoveAbove(omnibox_view_->GetRelativeWindowForPopup()); 350 popup_->StackAbove(omnibox_view_->GetRelativeWindowForPopup());
351 if (!popup_.get()) { 351 if (!popup_.get()) {
352 // For some IMEs GetRelativeWindowForPopup triggers the omnibox to lose 352 // For some IMEs GetRelativeWindowForPopup triggers the omnibox to lose
353 // focus, thereby closing (and destroying) the popup. 353 // focus, thereby closing (and destroying) the popup.
354 // TODO(sky): this won't be needed once we close the omnibox on input 354 // TODO(sky): this won't be needed once we close the omnibox on input
355 // window showing. 355 // window showing.
356 return; 356 return;
357 } 357 }
358 popup_->Show(); 358 popup_->Show();
359 } else { 359 } else {
360 // Animate the popup shrinking, but don't animate growing larger since that 360 // Animate the popup shrinking, but don't animate growing larger since that
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 opt_in_view_ = NULL; 688 opt_in_view_ = NULL;
689 PromoCounter* counter = profile_->GetInstantPromoCounter(); 689 PromoCounter* counter = profile_->GetInstantPromoCounter();
690 DCHECK(counter); 690 DCHECK(counter);
691 counter->Hide(); 691 counter->Hide();
692 if (opt_in) { 692 if (opt_in) {
693 browser::ShowInstantConfirmDialogIfNecessary( 693 browser::ShowInstantConfirmDialogIfNecessary(
694 location_bar_->GetWidget()->GetNativeWindow(), profile_); 694 location_bar_->GetWidget()->GetNativeWindow(), profile_);
695 } 695 }
696 UpdatePopupAppearance(); 696 UpdatePopupAppearance();
697 } 697 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/hung_renderer_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698