diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 16:42:25 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 16:42:25 +0000 |
| commit | 807bfceada33743cad3308af48c538d7d7515495 (patch) | |
| tree | 19953eac8d00695cfbb8c00137d8eb192e0aedc7 /chrome/browser/browser_init.cc | |
| parent | 7b7965f2391594e6a3944ffee8fcdaaf18683fc3 (diff) | |
| download | chromium_src-807bfceada33743cad3308af48c538d7d7515495.zip chromium_src-807bfceada33743cad3308af48c538d7d7515495.tar.gz chromium_src-807bfceada33743cad3308af48c538d7d7515495.tar.bz2 | |
Move more view stuff out of WebContents. This moves context menus and info
bars. I removed the associated functions on TabContents, and have callers call
directly through to the view when the care about mucking with the info bar
(which is busted, IMO).
Review URL: http://codereview.chromium.org/7245
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index a9e0134..ff4b22a 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -29,6 +29,7 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/web_app_launcher.h" +#include "chrome/browser/web_contents_view.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -554,9 +555,11 @@ void BrowserInit::LaunchWithProfile::AddCrashedInfoBarIfNecessary( if (!profile_->DidLastSessionExitCleanly() && web_contents) { // The last session didn't exit cleanly. Show an infobar to the user // so that they can restore if they want. - web_contents->GetInfoBarView()-> + // TODO(brettw) this should be done more cleanly, by adding a message to + // the view and not getting the info bar from inside it directly. + web_contents->view()->GetInfoBarView()-> AddChildView(new SessionCrashedView(profile_)); - web_contents->SetInfoBarVisible(true); + web_contents->view()->SetInfoBarVisible(true); } } |