chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc - Issue 5606002: Move:...

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

Issue 5606002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 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

« no previous file with comments | « chrome/browser/ui/views/accessible_view_helper.cc ('k') | chrome/browser/ui/views/autofill_profiles_view_win.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/views/autocomplete/autocomplete_popup_contents_view.h"	5 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"

6	6

7 #include "app/bidi_line_iterator.h"	7 #include "app/bidi_line_iterator.h"

8 #include "app/l10n_util.h"	8 #include "app/l10n_util.h"

9 #include "app/resource_bundle.h"	9 #include "app/resource_bundle.h"

10 #include "app/theme_provider.h"	10 #include "app/theme_provider.h"

11 #include "app/text_elider.h"	11 #include "app/text_elider.h"

12 #include "base/compiler_specific.h"	12 #include "base/compiler_specific.h"

13 #include "base/i18n/rtl.h"	13 #include "base/i18n/rtl.h"

14 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

15 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"	15 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"

16 #include "chrome/browser/autocomplete/autocomplete_match.h"	16 #include "chrome/browser/autocomplete/autocomplete_match.h"

17 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"	17 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"

18 #include "chrome/browser/instant/instant_confirm_dialog.h"	18 #include "chrome/browser/instant/instant_confirm_dialog.h"

19 #include "chrome/browser/instant/promo_counter.h"	19 #include "chrome/browser/instant/promo_counter.h"

20 #include "chrome/browser/profile.h"	20 #include "chrome/browser/profiles/profile.h"

21 #include "chrome/browser/views/bubble_border.h"	21 #include "chrome/browser/views/bubble_border.h"

22 #include "chrome/browser/views/location_bar/location_bar_view.h"	22 #include "chrome/browser/views/location_bar/location_bar_view.h"

23 #include "gfx/canvas_skia.h"	23 #include "gfx/canvas_skia.h"

24 #include "gfx/color_utils.h"	24 #include "gfx/color_utils.h"

25 #include "gfx/insets.h"	25 #include "gfx/insets.h"

26 #include "gfx/path.h"	26 #include "gfx/path.h"

27 #include "grit/chromium_strings.h"	27 #include "grit/chromium_strings.h"

28 #include "grit/generated_resources.h"	28 #include "grit/generated_resources.h"

29 #include "grit/theme_resources.h"	29 #include "grit/theme_resources.h"

30 #include "third_party/skia/include/core/SkShader.h"	30 #include "third_party/skia/include/core/SkShader.h"

(...skipping 1171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1202 opt_in_view_ = NULL;	1202 opt_in_view_ = NULL;

1203 PromoCounter* counter = model_->profile()->GetInstantPromoCounter();	1203 PromoCounter* counter = model_->profile()->GetInstantPromoCounter();

1204 DCHECK(counter);	1204 DCHECK(counter);

1205 counter->Hide();	1205 counter->Hide();

1206 if (opt_in) {	1206 if (opt_in) {

1207 browser::ShowInstantConfirmDialogIfNecessary(	1207 browser::ShowInstantConfirmDialogIfNecessary(

1208 location_bar_->GetWindow()->GetNativeWindow(), model_->profile());	1208 location_bar_->GetWindow()->GetNativeWindow(), model_->profile());

1209 }	1209 }

1210 UpdatePopupAppearance();	1210 UpdatePopupAppearance();

1211 }	1211 }

OLD	NEW