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

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

Issue 449016: Point #include lines to the new tcmalloc/chromium local branch.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: add back webkit\DEPS after fresh restart Created 11 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 | « base/leak_annotations.h ('k') | chrome/browser/memory_purger.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #if defined(OS_WIN) 52 #if defined(OS_WIN)
53 #include "chrome/browser/views/about_ipc_dialog.h" 53 #include "chrome/browser/views/about_ipc_dialog.h"
54 #include "chrome/browser/views/about_network_dialog.h" 54 #include "chrome/browser/views/about_network_dialog.h"
55 #elif defined(OS_CHROMEOS) 55 #elif defined(OS_CHROMEOS)
56 #include "chrome/browser/chromeos/version_loader.h" 56 #include "chrome/browser/chromeos/version_loader.h"
57 #elif defined(OS_MACOSX) 57 #elif defined(OS_MACOSX)
58 #include "chrome/browser/cocoa/about_ipc_dialog.h" 58 #include "chrome/browser/cocoa/about_ipc_dialog.h"
59 #endif 59 #endif
60 60
61 #if defined(USE_TCMALLOC) 61 #if defined(USE_TCMALLOC)
62 #include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h" 62 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
63 #endif 63 #endif
64 64
65 using sync_api::SyncManager; 65 using sync_api::SyncManager;
66 66
67 using base::Time; 67 using base::Time;
68 using base::TimeDelta; 68 using base::TimeDelta;
69 69
70 #if defined(USE_TCMALLOC) 70 #if defined(USE_TCMALLOC)
71 // Glue between the callback task and the method in the singleton. 71 // Glue between the callback task and the method in the singleton.
72 void AboutTcmallocRendererCallback(base::ProcessId pid, std::string output) { 72 void AboutTcmallocRendererCallback(base::ProcessId pid, std::string output) {
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 // Run the dialog. This will re-use the existing one if it's already up. 922 // Run the dialog. This will re-use the existing one if it's already up.
923 AboutIPCDialog::RunDialog(); 923 AboutIPCDialog::RunDialog();
924 return true; 924 return true;
925 } 925 }
926 #endif 926 #endif
927 927
928 #endif // OFFICIAL_BUILD 928 #endif // OFFICIAL_BUILD
929 929
930 return false; 930 return false;
931 } 931 }
OLDNEW
« no previous file with comments | « base/leak_annotations.h ('k') | chrome/browser/memory_purger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698