| Index: components/sad_tab/sad_tab_helper.cc
|
| diff --git a/chrome/browser/ui/sad_tab_helper.cc b/components/sad_tab/sad_tab_helper.cc
|
| similarity index 42%
|
| rename from chrome/browser/ui/sad_tab_helper.cc
|
| rename to components/sad_tab/sad_tab_helper.cc
|
| index ab8a6e034ea0d62936f59147d5f36a64856817e1..8cdd7baede3634f4a6c0cfdbd0336b4d2794ec56 100644
|
| --- a/chrome/browser/ui/sad_tab_helper.cc
|
| +++ b/components/sad_tab/sad_tab_helper.cc
|
| @@ -2,20 +2,32 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/ui/sad_tab_helper.h"
|
| +#include "components/sad_tab/sad_tab_helper.h"
|
|
|
| -#include "base/logging.h"
|
| -#include "chrome/browser/browser_shutdown.h"
|
| -#include "chrome/browser/ui/sad_tab.h"
|
| -#include "content/public/browser/web_contents.h"
|
| +#include "components/sad_tab/sad_tab.h"
|
| +#include "components/sad_tab/sad_tab_client.h"
|
|
|
| -DEFINE_WEB_CONTENTS_USER_DATA_KEY(SadTabHelper);
|
| +DEFINE_WEB_CONTENTS_USER_DATA_KEY(sad_tab::SadTabHelper);
|
| +
|
| +namespace sad_tab {
|
| +
|
| +// static
|
| +void SadTabHelper::CreateForWebContentsWithClient(
|
| + content::WebContents* contents,
|
| + scoped_ptr<SadTabClient> client) {
|
| + if (!FromWebContents(contents)) {
|
| + contents->SetUserData(UserDataKey(),
|
| + new SadTabHelper(contents, client.Pass()));
|
| + }
|
| +}
|
|
|
| SadTabHelper::~SadTabHelper() {
|
| }
|
|
|
| -SadTabHelper::SadTabHelper(content::WebContents* web_contents)
|
| - : content::WebContentsObserver(web_contents) {
|
| +SadTabHelper::SadTabHelper(content::WebContents* web_contents,
|
| + scoped_ptr<SadTabClient> client)
|
| + : content::WebContentsObserver(web_contents),
|
| + client_(client.Pass()) {
|
| }
|
|
|
| void SadTabHelper::RenderViewReady() {
|
| @@ -29,20 +41,21 @@ void SadTabHelper::RenderProcessGone(base::TerminationStatus status) {
|
| // Only show the sad tab if we're not in browser shutdown, so that WebContents
|
| // objects that are not in a browser (e.g., HTML dialogs) and thus are
|
| // visible do not flash a sad tab page.
|
| - if (browser_shutdown::GetShutdownType() != browser_shutdown::NOT_VALID)
|
| + if (client_->IsInBrowserShutdown())
|
| return;
|
|
|
| if (sad_tab_)
|
| return;
|
|
|
| - if (chrome::SadTab::ShouldShow(status))
|
| + if (SadTab::ShouldShow(status))
|
| InstallSadTab(status);
|
| }
|
|
|
| void SadTabHelper::InstallSadTab(base::TerminationStatus status) {
|
| - chrome::SadTabKind kind =
|
| - (status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED) ?
|
| - chrome::SAD_TAB_KIND_KILLED : chrome::SAD_TAB_KIND_CRASHED;
|
| - sad_tab_.reset(chrome::SadTab::Create(web_contents(), kind));
|
| + SadTabKind kind = (status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED) ?
|
| + SAD_TAB_KIND_KILLED : SAD_TAB_KIND_CRASHED;
|
| + sad_tab_.reset(SadTab::Create(web_contents(), kind, client_.get()));
|
| sad_tab_->Show();
|
| }
|
| +
|
| +} // namespace sad_tab
|
|
|