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

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

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed. Created 8 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) 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "chrome/browser/chromeos/customization_document.h" 78 #include "chrome/browser/chromeos/customization_document.h"
79 #include "chrome/browser/chromeos/login/wizard_controller.h" 79 #include "chrome/browser/chromeos/login/wizard_controller.h"
80 #include "chrome/browser/chromeos/version_loader.h" 80 #include "chrome/browser/chromeos/version_loader.h"
81 #include "chrome/browser/oom_priority_manager.h" 81 #include "chrome/browser/oom_priority_manager.h"
82 #include "content/browser/zygote_host_linux.h" 82 #include "content/browser/zygote_host_linux.h"
83 #elif defined(OS_LINUX) || defined(OS_OPENBSD) 83 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
84 #include "content/browser/zygote_host_linux.h" 84 #include "content/browser/zygote_host_linux.h"
85 #endif 85 #endif
86 86
87 #if defined(USE_TCMALLOC) 87 #if defined(USE_TCMALLOC)
88 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" 88 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
89 #endif 89 #endif
90 90
91 using base::Time; 91 using base::Time;
92 using base::TimeDelta; 92 using base::TimeDelta;
93 using content::BrowserThread; 93 using content::BrowserThread;
94 using content::PluginService; 94 using content::PluginService;
95 using content::WebContents; 95 using content::WebContents;
96 96
97 namespace { 97 namespace {
98 98
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1383 } 1383 }
1384 1384
1385 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) 1385 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
1386 : WebUIController(web_ui) { 1386 : WebUIController(web_ui) {
1387 Profile* profile = Profile::FromWebUI(web_ui); 1387 Profile* profile = Profile::FromWebUI(web_ui);
1388 ChromeURLDataManager::DataSource* source = 1388 ChromeURLDataManager::DataSource* source =
1389 new AboutUIHTMLSource(name, profile); 1389 new AboutUIHTMLSource(name, profile);
1390 if (source) 1390 if (source)
1391 profile->GetChromeURLDataManager()->AddDataSource(source); 1391 profile->GetChromeURLDataManager()->AddDataSource(source);
1392 } 1392 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698