OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/omnibox/alternate_nav_infobar_delegate.h" | 5 #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h" |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/browser/autocomplete/shortcuts_backend.h" | 8 #include "chrome/browser/autocomplete/shortcuts_backend.h" |
9 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" | 9 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" |
10 #include "chrome/browser/history/history_service.h" | 10 #include "chrome/browser/history/history_service.h" |
11 #include "chrome/browser/history/history_service_factory.h" | 11 #include "chrome/browser/history/history_service_factory.h" |
12 #include "chrome/browser/infobars/infobar.h" | |
13 #include "chrome/browser/infobars/infobar_service.h" | 12 #include "chrome/browser/infobars/infobar_service.h" |
14 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "components/infobars/core/infobar.h" |
15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
16 #include "grit/generated_resources.h" | 16 #include "grit/generated_resources.h" |
17 #include "grit/theme_resources.h" | 17 #include "grit/theme_resources.h" |
18 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
19 | 19 |
20 | 20 |
21 AlternateNavInfoBarDelegate::~AlternateNavInfoBarDelegate() { | 21 AlternateNavInfoBarDelegate::~AlternateNavInfoBarDelegate() { |
22 } | 22 } |
23 | 23 |
24 // static | 24 // static |
25 void AlternateNavInfoBarDelegate::Create( | 25 void AlternateNavInfoBarDelegate::Create( |
26 content::WebContents* web_contents, | 26 content::WebContents* web_contents, |
27 const base::string16& text, | 27 const base::string16& text, |
28 const AutocompleteMatch& match, | 28 const AutocompleteMatch& match, |
29 const GURL& search_url) { | 29 const GURL& search_url) { |
30 InfoBarService* infobar_service = | 30 InfoBarService* infobar_service = |
31 InfoBarService::FromWebContents(web_contents); | 31 InfoBarService::FromWebContents(web_contents); |
32 infobar_service->AddInfoBar(AlternateNavInfoBarDelegate::CreateInfoBar( | 32 infobar_service->AddInfoBar(AlternateNavInfoBarDelegate::CreateInfoBar( |
33 scoped_ptr<AlternateNavInfoBarDelegate>(new AlternateNavInfoBarDelegate( | 33 scoped_ptr<AlternateNavInfoBarDelegate>(new AlternateNavInfoBarDelegate( |
34 Profile::FromBrowserContext(web_contents->GetBrowserContext()), text, | 34 Profile::FromBrowserContext(web_contents->GetBrowserContext()), text, |
35 match, search_url)))); | 35 match, search_url)))); |
36 } | 36 } |
37 | 37 |
38 AlternateNavInfoBarDelegate::AlternateNavInfoBarDelegate( | 38 AlternateNavInfoBarDelegate::AlternateNavInfoBarDelegate( |
39 Profile* profile, | 39 Profile* profile, |
40 const base::string16& text, | 40 const base::string16& text, |
41 const AutocompleteMatch& match, | 41 const AutocompleteMatch& match, |
42 const GURL& search_url) | 42 const GURL& search_url) |
43 : InfoBarDelegate(), | 43 : infobars::InfoBarDelegate(), |
44 profile_(profile), | 44 profile_(profile), |
45 text_(text), | 45 text_(text), |
46 match_(match), | 46 match_(match), |
47 search_url_(search_url) { | 47 search_url_(search_url) { |
48 DCHECK(match_.destination_url.is_valid()); | 48 DCHECK(match_.destination_url.is_valid()); |
49 DCHECK(search_url_.is_valid()); | 49 DCHECK(search_url_.is_valid()); |
50 } | 50 } |
51 | 51 |
52 // AlternateNavInfoBarDelegate::CreateInfoBar() is implemented in | 52 // AlternateNavInfoBarDelegate::CreateInfoBar() is implemented in |
53 // platform-specific files. | 53 // platform-specific files. |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 | 89 |
90 // We should always close, even if the navigation did not occur within this | 90 // We should always close, even if the navigation did not occur within this |
91 // WebContents. | 91 // WebContents. |
92 return true; | 92 return true; |
93 } | 93 } |
94 | 94 |
95 int AlternateNavInfoBarDelegate::GetIconID() const { | 95 int AlternateNavInfoBarDelegate::GetIconID() const { |
96 return IDR_INFOBAR_ALT_NAV_URL; | 96 return IDR_INFOBAR_ALT_NAV_URL; |
97 } | 97 } |
98 | 98 |
99 InfoBarDelegate::Type AlternateNavInfoBarDelegate::GetInfoBarType() const { | 99 infobars::InfoBarDelegate::Type AlternateNavInfoBarDelegate::GetInfoBarType() |
| 100 const { |
100 return PAGE_ACTION_TYPE; | 101 return PAGE_ACTION_TYPE; |
101 } | 102 } |
OLD | NEW |