chrome/browser/ui/views/select_file_dialog_extension.cc - Issue 1308823002: Move Singleton and related structs to namespace base

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/views/select_file_dialog_extension.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ToT Created 5 years, 3 months 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

« no previous file with comments | « chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/select_file_dialog_extension.cc

diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc

index 6a6a60efb93f1ab7751e179ee56fd4363abd610b..c31699be84ac0cc525c7d6645b1974923fb8c63f 100644

--- a/chrome/browser/ui/views/select_file_dialog_extension.cc

+++ b/chrome/browser/ui/views/select_file_dialog_extension.cc

@@ -60,7 +60,7 @@ class PendingDialog {

SelectFileDialogExtension::RoutingID id);

private:

- friend struct DefaultSingletonTraits<PendingDialog>;

+ friend struct base::DefaultSingletonTraits<PendingDialog>;

typedef std::map<SelectFileDialogExtension::RoutingID,

scoped_refptr<SelectFileDialogExtension> > Map;

Map map_;

@@ -68,7 +68,7 @@ class PendingDialog {

// static

PendingDialog* PendingDialog::GetInstance() {

- return Singleton<PendingDialog>::get();

+ return base::Singleton<PendingDialog>::get();

}

void PendingDialog::Add(SelectFileDialogExtension::RoutingID id,