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

Side by Side Diff: chrome/browser/browser_about_handler.cc

Issue 6532008: Fix chromium-style compile error that got in the tree since yesterday. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for Feb 17th Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/browser_about_handler.h" 5 #include "chrome/browser/browser_about_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 using base::Time; 80 using base::Time;
81 using base::TimeDelta; 81 using base::TimeDelta;
82 82
83 #if defined(USE_TCMALLOC) 83 #if defined(USE_TCMALLOC)
84 // static 84 // static
85 AboutTcmallocOutputs* AboutTcmallocOutputs::GetInstance() { 85 AboutTcmallocOutputs* AboutTcmallocOutputs::GetInstance() {
86 return Singleton<AboutTcmallocOutputs>::get(); 86 return Singleton<AboutTcmallocOutputs>::get();
87 } 87 }
88 88
89 AboutTcmallocOutputs::AboutTcmallocOutputs() {}
90
91 AboutTcmallocOutputs::~AboutTcmallocOutputs() {}
92
89 // Glue between the callback task and the method in the singleton. 93 // Glue between the callback task and the method in the singleton.
90 void AboutTcmallocRendererCallback(base::ProcessId pid, std::string output) { 94 void AboutTcmallocRendererCallback(base::ProcessId pid, std::string output) {
91 AboutTcmallocOutputs::GetInstance()->RendererCallback(pid, output); 95 AboutTcmallocOutputs::GetInstance()->RendererCallback(pid, output);
92 } 96 }
93 #endif 97 #endif
94 98
95 namespace { 99 namespace {
96 100
97 // The (alphabetized) paths used for the about pages. 101 // The (alphabetized) paths used for the about pages.
98 // Note: Keep these in sync with url_constants.h 102 // Note: Keep these in sync with url_constants.h
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 // Run the dialog. This will re-use the existing one if it's already up. 1126 // Run the dialog. This will re-use the existing one if it's already up.
1123 browser::ShowAboutIPCDialog(); 1127 browser::ShowAboutIPCDialog();
1124 return true; 1128 return true;
1125 } 1129 }
1126 #endif 1130 #endif
1127 1131
1128 #endif // OFFICIAL_BUILD 1132 #endif // OFFICIAL_BUILD
1129 1133
1130 return false; 1134 return false;
1131 } 1135 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.h ('k') | chrome/browser/extensions/extension_special_storage_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698