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

Unified Diff: chrome/browser/chromeos/login/registration_screen.cc

Issue 8480033: CrOs: Remove 29 exit time destructors and 8 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reupload 2 Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/registration_screen.cc
diff --git a/chrome/browser/chromeos/login/registration_screen.cc b/chrome/browser/chromeos/login/registration_screen.cc
index c73b2f61fa7f36ac65259cc576448d049ca19eb7..395331663881af3d92d6601e6dd2da440fde8bcf 100644
--- a/chrome/browser/chromeos/login/registration_screen.cc
+++ b/chrome/browser/chromeos/login/registration_screen.cc
@@ -56,9 +56,6 @@ WebPageDomView* RegistrationView::dom_view() {
// RegistrationScreen, public:
RegistrationScreen::RegistrationScreen(ViewScreenDelegate* delegate)
: ViewScreen<RegistrationView>(delegate) {
- if (!host_page_url_.get())
- set_registration_host_page_url(GURL(kRegistrationHostPageUrl));
-
ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
chrome::kCrosScheme);
net::URLRequestFilter::GetInstance()->AddHostnameHandler(
@@ -67,14 +64,6 @@ RegistrationScreen::RegistrationScreen(ViewScreenDelegate* delegate)
&RegistrationScreen::Factory);
}
-// static
-void RegistrationScreen::set_registration_host_page_url(const GURL& url) {
- host_page_url_.reset(new GURL(url));
-}
-
-// static
-scoped_ptr<GURL> RegistrationScreen::host_page_url_;
-
///////////////////////////////////////////////////////////////////////////////
// RegistrationScreen, ViewScreen implementation:
void RegistrationScreen::CreateView() {
@@ -84,7 +73,7 @@ void RegistrationScreen::CreateView() {
void RegistrationScreen::Refresh() {
StartTimeoutTimer();
- GURL url(*host_page_url_);
+ GURL url(kRegistrationHostPageUrl);
Profile* profile = ProfileManager::GetDefaultProfile();
view()->InitDOM(profile,
SiteInstance::CreateSiteInstanceForURL(profile, url));
« no previous file with comments | « chrome/browser/chromeos/login/registration_screen.h ('k') | chrome/browser/chromeos/login/wizard_accessibility_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698