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

Side by Side Diff: views/focus/view_storage.cc

Issue 5685007: Rename all methods accessing Singleton<T> as GetInstance(). (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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/focus/view_storage.h ('k') | views/view_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/focus/view_storage.h" 5 #include "views/focus/view_storage.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stl_util-inl.h" 10 #include "base/stl_util-inl.h"
11 11
12 namespace views { 12 namespace views {
13 13
14 // static 14 // static
15 ViewStorage* ViewStorage::GetSharedInstance() { 15 ViewStorage* ViewStorage::GetInstance() {
16 return Singleton<ViewStorage>::get(); 16 return Singleton<ViewStorage>::get();
17 } 17 }
18 18
19 ViewStorage::ViewStorage() : view_storage_next_id_(0) { 19 ViewStorage::ViewStorage() : view_storage_next_id_(0) {
20 } 20 }
21 21
22 ViewStorage::~ViewStorage() { 22 ViewStorage::~ViewStorage() {
23 STLDeleteContainerPairSecondPointers(view_to_ids_.begin(), 23 STLDeleteContainerPairSecondPointers(view_to_ids_.begin(),
24 view_to_ids_.end()); 24 view_to_ids_.end());
25 } 25 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 ids->erase(id_iter); 106 ids->erase(id_iter);
107 } 107 }
108 108
109 if (ids->empty()) { 109 if (ids->empty()) {
110 delete ids; 110 delete ids;
111 view_to_ids_.erase(ids_iter); 111 view_to_ids_.erase(ids_iter);
112 } 112 }
113 } 113 }
114 114
115 } // namespace views 115 } // namespace views
OLDNEW
« no previous file with comments | « views/focus/view_storage.h ('k') | views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698