chrome/browser/gtk/browser_window_gtk.cc - Issue 5711001: Add a new GetInstance() method for remaining files with singleton classes under chrome/browser.

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/gtk/browser_window_gtk.cc

Issue 5711001: Add a new GetInstance() method for remaining files with singleton classes under chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 10 years 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/chromeos/volume_bubble.h ('K') | « chrome/browser/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/gtk/gconf_titlebar_listener.h » ('j') | chrome/browser/gtk/gconf_titlebar_listener.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/gtk/browser_window_gtk.cc

diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc

index f0462e58174f89d9876cd4ae1a9f6e01bd72be9c..25c8f12553786e0a893ea01a83222c4a97dc707b 100644

--- a/chrome/browser/gtk/browser_window_gtk.cc

+++ b/chrome/browser/gtk/browser_window_gtk.cc

@@ -663,7 +663,7 @@ void BrowserWindowGtk::Close() {

if (accel_group_) {

// Disconnecting the keys we connected to our accelerator group frees the

// closures allocated in ConnectAccelerators.

- AcceleratorsGtk* accelerators = Singleton<AcceleratorsGtk>().get();

+ AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance();

for (AcceleratorsGtk::const_iterator iter = accelerators->begin();

iter != accelerators->end(); ++iter) {

gtk_accel_group_disconnect_key(accel_group_,

@@ -1721,7 +1721,7 @@ void BrowserWindowGtk::ConnectAccelerators() {

accel_group_ = gtk_accel_group_new();

gtk_window_add_accel_group(window_, accel_group_);

- AcceleratorsGtk* accelerators = Singleton<AcceleratorsGtk>().get();

+ AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance();

for (AcceleratorsGtk::const_iterator iter = accelerators->begin();

iter != accelerators->end(); ++iter) {

gtk_accel_group_connect(