chrome/browser/ui/views/location_bar/location_bar_view.cc - Issue 11825005: Move alternate_nav_infobar_delegate.* from c/b/infobars/ to c/b/ui/omnibox.

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 11825005: Move alternate_nav_infobar_delegate.* from c/b/infobars/ to c/b/ui/omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: update chrome_browser_ui.gypi as well Created 7 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/infobars/alternate_nav_infobar_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
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/location_bar/location_bar_view.h"	5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <map>	8 #include <map>

9	9

10 #include "base/command_line.h"	10 #include "base/command_line.h"

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

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

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

14 #include "chrome/app/chrome_command_ids.h"	14 #include "chrome/app/chrome_command_ids.h"

15 #include "chrome/browser/alternate_nav_url_fetcher.h"

16 #include "chrome/browser/command_updater.h"	15 #include "chrome/browser/command_updater.h"

17 #include "chrome/browser/defaults.h"	16 #include "chrome/browser/defaults.h"

18 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"	17 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"

19 #include "chrome/browser/extensions/location_bar_controller.h"	18 #include "chrome/browser/extensions/location_bar_controller.h"

20 #include "chrome/browser/extensions/script_bubble_controller.h"	19 #include "chrome/browser/extensions/script_bubble_controller.h"

21 #include "chrome/browser/extensions/tab_helper.h"	20 #include "chrome/browser/extensions/tab_helper.h"

22 #include "chrome/browser/favicon/favicon_tab_helper.h"	21 #include "chrome/browser/favicon/favicon_tab_helper.h"

23 #include "chrome/browser/prefs/pref_service.h"	22 #include "chrome/browser/prefs/pref_service.h"

24 #include "chrome/browser/profiles/profile.h"	23 #include "chrome/browser/profiles/profile.h"

25 #include "chrome/browser/search_engines/template_url.h"	24 #include "chrome/browser/search_engines/template_url.h"

26 #include "chrome/browser/search_engines/template_url_service.h"	25 #include "chrome/browser/search_engines/template_url_service.h"

27 #include "chrome/browser/search_engines/template_url_service_factory.h"	26 #include "chrome/browser/search_engines/template_url_service_factory.h"

28 #include "chrome/browser/ui/browser.h"	27 #include "chrome/browser/ui/browser.h"

29 #include "chrome/browser/ui/browser_finder.h"	28 #include "chrome/browser/ui/browser_finder.h"

30 #include "chrome/browser/ui/browser_instant_controller.h"	29 #include "chrome/browser/ui/browser_instant_controller.h"

31 #include "chrome/browser/ui/browser_tabstrip.h"	30 #include "chrome/browser/ui/browser_tabstrip.h"

	31 #include "chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h"

32 #include "chrome/browser/ui/omnibox/location_bar_util.h"	32 #include "chrome/browser/ui/omnibox/location_bar_util.h"

33 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"	33 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"

34 #include "chrome/browser/ui/view_ids.h"	34 #include "chrome/browser/ui/view_ids.h"

35 #include "chrome/browser/ui/views/bookmarks/bookmark_prompt_view.h"	35 #include "chrome/browser/ui/views/bookmarks/bookmark_prompt_view.h"

36 #include "chrome/browser/ui/views/browser_dialogs.h"	36 #include "chrome/browser/ui/views/browser_dialogs.h"

37 #include "chrome/browser/ui/views/extensions/extension_popup.h"	37 #include "chrome/browser/ui/views/extensions/extension_popup.h"

38 #include "chrome/browser/ui/views/location_bar/action_box_button_view.h"	38 #include "chrome/browser/ui/views/location_bar/action_box_button_view.h"

39 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"	39 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"

40 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"	40 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"

41 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"	41 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"

(...skipping 1391 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1433 int LocationBarView::GetInternalHeight(bool use_preferred_size) {	1433 int LocationBarView::GetInternalHeight(bool use_preferred_size) {

1434 int total_height =	1434 int total_height =

1435 use_preferred_size ? GetPreferredSize().height() : height();	1435 use_preferred_size ? GetPreferredSize().height() : height();

1436 return std::max(total_height - (kVerticalEdgeThickness * 2), 0);	1436 return std::max(total_height - (kVerticalEdgeThickness * 2), 0);

1437 }	1437 }

1438	1438

1439 bool LocationBarView::HasValidSuggestText() const {	1439 bool LocationBarView::HasValidSuggestText() const {

1440 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&	1440 return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&

1441 !suggested_text_view_->text().empty();	1441 !suggested_text_view_->text().empty();

1442 }	1442 }

OLD	NEW