chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc - Issue 8609002: CrOs: Remove 16 exit time destructors and 11 static initializers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

Issue 8609002: CrOs: Remove 16 exit time destructors and 11 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . 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

« chrome/browser/ui/views/create_application_shortcut_view.cc ('K') | « chrome/browser/ui/views/toolbar_view.cc ('k') | chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

index a3be126a901a5e73718450ab82d6cd45b95d7766..c9b6f6d7b85616fa55e36f09bf9fb5143d482fd4 100644

--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

@@ -142,8 +142,8 @@ void ChangePictureOptionsHandler::HandleChooseFile(const ListValue* args) {

}

// Static so we initialize it only once.

- static SelectFileDialog::FileTypeInfo file_type_info =

- GetUserImageFileTypeInfo();

+ CR_DEFINE_STATIC_LOCAL(SelectFileDialog::FileTypeInfo, file_type_info,

+ (GetUserImageFileTypeInfo()));

select_file_dialog_->SelectFile(

SelectFileDialog::SELECT_OPEN_FILE,