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

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

Issue 11734021: Roll ICU and convert include style to standard Chromium style, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/i18n/number_formatting.h" 9 #include "base/i18n/number_formatting.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 25 matching lines...) Expand all
36 #include "content/public/browser/gpu_data_manager.h" 36 #include "content/public/browser/gpu_data_manager.h"
37 #include "content/public/browser/gpu_data_manager_observer.h" 37 #include "content/public/browser/gpu_data_manager_observer.h"
38 #include "content/public/browser/render_view_host.h" 38 #include "content/public/browser/render_view_host.h"
39 #include "content/public/browser/resource_request_info.h" 39 #include "content/public/browser/resource_request_info.h"
40 #include "content/public/browser/web_contents.h" 40 #include "content/public/browser/web_contents.h"
41 #include "content/public/browser/web_contents_delegate.h" 41 #include "content/public/browser/web_contents_delegate.h"
42 #include "content/public/common/result_codes.h" 42 #include "content/public/common/result_codes.h"
43 #include "grit/chromium_strings.h" 43 #include "grit/chromium_strings.h"
44 #include "grit/generated_resources.h" 44 #include "grit/generated_resources.h"
45 #include "grit/ui_resources.h" 45 #include "grit/ui_resources.h"
46 #include "third_party/icu/public/i18n/unicode/coll.h"
46 #include "ui/base/l10n/l10n_util.h" 47 #include "ui/base/l10n/l10n_util.h"
47 #include "ui/base/resource/resource_bundle.h" 48 #include "ui/base/resource/resource_bundle.h"
48 #include "ui/base/text/bytes_formatting.h" 49 #include "ui/base/text/bytes_formatting.h"
49 #include "ui/gfx/image/image_skia.h" 50 #include "ui/gfx/image/image_skia.h"
50 #include "unicode/coll.h"
51 51
52 using content::BrowserThread; 52 using content::BrowserThread;
53 using content::OpenURLParams; 53 using content::OpenURLParams;
54 using content::Referrer; 54 using content::Referrer;
55 using content::ResourceRequestInfo; 55 using content::ResourceRequestInfo;
56 using content::WebContents; 56 using content::WebContents;
57 57
58 namespace { 58 namespace {
59 59
60 // The delay between updates of the information (in ms). 60 // The delay between updates of the information (in ms).
(...skipping 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 // Count the number of extensions with background pages (including 1343 // Count the number of extensions with background pages (including
1344 // incognito). 1344 // incognito).
1345 count += CountExtensionBackgroundPagesForProfile(profile); 1345 count += CountExtensionBackgroundPagesForProfile(profile);
1346 if (profile->HasOffTheRecordProfile()) { 1346 if (profile->HasOffTheRecordProfile()) {
1347 count += CountExtensionBackgroundPagesForProfile( 1347 count += CountExtensionBackgroundPagesForProfile(
1348 profile->GetOffTheRecordProfile()); 1348 profile->GetOffTheRecordProfile());
1349 } 1349 }
1350 } 1350 }
1351 return count; 1351 return count;
1352 } 1352 }
OLDNEW
« no previous file with comments | « chrome/browser/spellchecker/spelling_service_client.cc ('k') | chrome/browser/ui/omnibox/omnibox_popup_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698