summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/omnibox/omnibox_navigation_observer.h
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-19 00:13:43 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-19 00:13:43 +0000
commitf9dac2c74ee05653fda500ea77dbce4aac3eea70 (patch)
treefe47492399577c1ed7fd0e13a49a3522c1175ac1 /chrome/browser/ui/omnibox/omnibox_navigation_observer.h
parent9262e5caed7c84c315b41ce00f99181616523604 (diff)
downloadchromium_src-f9dac2c74ee05653fda500ea77dbce4aac3eea70.zip
chromium_src-f9dac2c74ee05653fda500ea77dbce4aac3eea70.tar.gz
chromium_src-f9dac2c74ee05653fda500ea77dbce4aac3eea70.tar.bz2
Move the ShortcutsBackend from history to autocomplete so that it can fully
depend on autocomplete types and functions without violating layering rules. Also fixes some minor style guide issues, e.g. non-private member variables. BUG=341137 TEST=none R=brettw@chromium.org, rlp@chromium.org, skanuj@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/200493006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox/omnibox_navigation_observer.h')
-rw-r--r--chrome/browser/ui/omnibox/omnibox_navigation_observer.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_navigation_observer.h b/chrome/browser/ui/omnibox/omnibox_navigation_observer.h
index f4a795c..8253173 100644
--- a/chrome/browser/ui/omnibox/omnibox_navigation_observer.h
+++ b/chrome/browser/ui/omnibox/omnibox_navigation_observer.h
@@ -15,9 +15,7 @@
#include "content/public/browser/web_contents_observer.h"
#include "net/url_request/url_fetcher_delegate.h"
-namespace history {
class ShortcutsBackend;
-}
namespace net {
class URLFetcher;
@@ -97,8 +95,7 @@ class OmniboxNavigationObserver : public content::NotificationObserver,
const base::string16 text_;
const AutocompleteMatch match_;
const AutocompleteMatch alternate_nav_match_;
- scoped_refptr<history::ShortcutsBackend> shortcuts_backend_; // May be NULL
- // in incognito.
+ scoped_refptr<ShortcutsBackend> shortcuts_backend_; // NULL in incognito.
scoped_ptr<net::URLFetcher> fetcher_;
LoadState load_state_;
FetchState fetch_state_;