diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:39:13 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:39:13 +0000 |
| commit | 8286f51aaab9c769e70a1bcad5c568cec6636ba0 (patch) | |
| tree | a741bc9016024ee0e092dfcbdc292a3d54c28c34 /chrome/browser/ui/browser_init.cc | |
| parent | c8e2646cd5873468fe7497889c8b30da5f3cd2d4 (diff) | |
| download | chromium_src-8286f51aaab9c769e70a1bcad5c568cec6636ba0.zip chromium_src-8286f51aaab9c769e70a1bcad5c568cec6636ba0.tar.gz chromium_src-8286f51aaab9c769e70a1bcad5c568cec6636ba0.tar.bz2 | |
Factor load notification detail structs out of NavigationController and into
their own file in the |content| namespace. Remove un-necessary includes of
navigation_controller.h.
BUG=none
TEST=everything compiles
Review URL: http://codereview.chromium.org/7008018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_init.cc')
| -rw-r--r-- | chrome/browser/ui/browser_init.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index d29f756..ec1c083 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -62,7 +62,7 @@ #include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" #include "content/browser/renderer_host/render_process_host.h" -#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/common/result_codes.h" #include "grit/chromium_strings.h" @@ -142,7 +142,7 @@ class DefaultBrowserInfoBarDelegate : public ConfirmInfoBarDelegate { // ConfirmInfoBarDelegate: virtual bool ShouldExpire( - const NavigationController::LoadCommittedDetails& details) const OVERRIDE; + const content::LoadCommittedDetails& details) const OVERRIDE; virtual gfx::Image* GetIcon() const OVERRIDE; virtual string16 GetMessageText() const OVERRIDE; virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; @@ -185,7 +185,7 @@ DefaultBrowserInfoBarDelegate::~DefaultBrowserInfoBarDelegate() { } bool DefaultBrowserInfoBarDelegate::ShouldExpire( - const NavigationController::LoadCommittedDetails& details) const { + const content::LoadCommittedDetails& details) const { return details.is_user_initiated_main_frame_load() && should_expire_; } |