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

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

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 "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 16 matching lines...) Expand all
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/base/theme_provider.h" 28 #include "ui/base/theme_provider.h"
29 #include "ui/gfx/canvas_skia.h" 29 #include "ui/gfx/canvas_skia.h"
30 #include "ui/gfx/insets.h" 30 #include "ui/gfx/insets.h"
31 #include "ui/gfx/path.h" 31 #include "ui/gfx/path.h"
32 #include "ui/views/bubble/bubble_border.h" 32 #include "ui/views/bubble/bubble_border.h"
33 #include "ui/views/controls/button/text_button.h" 33 #include "ui/views/controls/button/text_button.h"
34 #include "ui/views/controls/label.h" 34 #include "ui/views/controls/label.h"
35 #include "ui/views/layout/grid_layout.h" 35 #include "ui/views/layout/grid_layout.h"
36 #include "ui/views/layout/layout_constants.h" 36 #include "ui/views/layout/layout_constants.h"
37 #include "ui/views/painter.h"
37 #include "ui/views/widget/widget.h" 38 #include "ui/views/widget/widget.h"
38 #include "unicode/ubidi.h" 39 #include "unicode/ubidi.h"
39 #include "views/painter.h"
40 40
41 #if defined(OS_WIN) 41 #if defined(OS_WIN)
42 #include "base/win/scoped_gdi_object.h" 42 #include "base/win/scoped_gdi_object.h"
43 #if !defined(USE_AURA) 43 #if !defined(USE_AURA)
44 #include "ui/views/widget/native_widget_win.h" 44 #include "ui/views/widget/native_widget_win.h"
45 #endif 45 #endif
46 #endif 46 #endif
47 47
48 namespace { 48 namespace {
49 49
(...skipping 638 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

Powered by Google App Engine
This is Rietveld 408576698