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

Side by Side Diff: chrome/browser/ui/webui/about_ui.cc

Issue 9667026: Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
« no previous file with comments | « chrome/browser/memory_purger.cc ('k') | chrome/renderer/chrome_render_process_observer.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/about_ui.h" 5 #include "chrome/browser/ui/webui/about_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 80 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
81 #include "chrome/browser/chromeos/login/wizard_controller.h" 81 #include "chrome/browser/chromeos/login/wizard_controller.h"
82 #include "chrome/browser/chromeos/version_loader.h" 82 #include "chrome/browser/chromeos/version_loader.h"
83 #include "chrome/browser/oom_priority_manager.h" 83 #include "chrome/browser/oom_priority_manager.h"
84 #include "content/public/browser/zygote_host_linux.h" 84 #include "content/public/browser/zygote_host_linux.h"
85 #elif defined(OS_LINUX) || defined(OS_OPENBSD) 85 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
86 #include "content/public/browser/zygote_host_linux.h" 86 #include "content/public/browser/zygote_host_linux.h"
87 #endif 87 #endif
88 88
89 #if defined(USE_TCMALLOC) 89 #if defined(USE_TCMALLOC)
90 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" 90 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
91 #endif 91 #endif
92 92
93 using base::Time; 93 using base::Time;
94 using base::TimeDelta; 94 using base::TimeDelta;
95 using content::BrowserThread; 95 using content::BrowserThread;
96 using content::PluginService; 96 using content::PluginService;
97 using content::WebContents; 97 using content::WebContents;
98 98
99 namespace { 99 namespace {
100 100
(...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after
1402 } 1402 }
1403 1403
1404 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) 1404 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
1405 : WebUIController(web_ui) { 1405 : WebUIController(web_ui) {
1406 Profile* profile = Profile::FromWebUI(web_ui); 1406 Profile* profile = Profile::FromWebUI(web_ui);
1407 ChromeURLDataManager::DataSource* source = 1407 ChromeURLDataManager::DataSource* source =
1408 new AboutUIHTMLSource(name, profile); 1408 new AboutUIHTMLSource(name, profile);
1409 if (source) 1409 if (source)
1410 profile->GetChromeURLDataManager()->AddDataSource(source); 1410 profile->GetChromeURLDataManager()->AddDataSource(source);
1411 } 1411 }
OLDNEW
« no previous file with comments | « chrome/browser/memory_purger.cc ('k') | chrome/renderer/chrome_render_process_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698