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

Side by Side Diff: chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc

Issue 839193002: Move ServiceAccessType into //components/keyed_service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation on android Created 5 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
OLDNEW
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"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // Tell the shortcuts backend to remove the shortcut it added for the original 68 // Tell the shortcuts backend to remove the shortcut it added for the original
69 // search and instead add one reflecting this navigation. 69 // search and instead add one reflecting this navigation.
70 scoped_refptr<ShortcutsBackend> shortcuts_backend( 70 scoped_refptr<ShortcutsBackend> shortcuts_backend(
71 ShortcutsBackendFactory::GetForProfile(profile_)); 71 ShortcutsBackendFactory::GetForProfile(profile_));
72 if (shortcuts_backend.get()) { // May be NULL in incognito. 72 if (shortcuts_backend.get()) { // May be NULL in incognito.
73 shortcuts_backend->DeleteShortcutsWithURL(search_url_); 73 shortcuts_backend->DeleteShortcutsWithURL(search_url_);
74 shortcuts_backend->AddOrUpdateShortcut(text_, match_); 74 shortcuts_backend->AddOrUpdateShortcut(text_, match_);
75 } 75 }
76 76
77 // Tell the history system to remove any saved search term for the search. 77 // Tell the history system to remove any saved search term for the search.
78 HistoryService* const history_service = 78 HistoryService* const history_service = HistoryServiceFactory::GetForProfile(
79 HistoryServiceFactory::GetForProfile(profile_, Profile::IMPLICIT_ACCESS); 79 profile_, ServiceAccessType::IMPLICIT_ACCESS);
80 if (history_service) 80 if (history_service)
81 history_service->DeleteKeywordSearchTermForURL(search_url_); 81 history_service->DeleteKeywordSearchTermForURL(search_url_);
82 82
83 // Pretend the user typed this URL, so that navigating to it will be the 83 // Pretend the user typed this URL, so that navigating to it will be the
84 // default action when it's typed again in the future. 84 // default action when it's typed again in the future.
85 InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL( 85 InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
86 content::OpenURLParams(match_.destination_url, content::Referrer(), 86 content::OpenURLParams(match_.destination_url, content::Referrer(),
87 disposition, ui::PAGE_TRANSITION_TYPED, 87 disposition, ui::PAGE_TRANSITION_TYPED,
88 false)); 88 false));
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 infobars::InfoBarDelegate::Type AlternateNavInfoBarDelegate::GetInfoBarType() 99 infobars::InfoBarDelegate::Type AlternateNavInfoBarDelegate::GetInfoBarType()
100 const { 100 const {
101 return PAGE_ACTION_TYPE; 101 return PAGE_ACTION_TYPE;
102 } 102 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/find_bar/find_bar_host_browsertest.cc ('k') | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698