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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
« no previous file with comments | « chrome/browser/omnibox_search_hint.cc ('k') | chrome/browser/password_manager_delegate_impl.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/page_info_model.h" 5 #include "chrome/browser/page_info_model.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h"
11 #include "base/command_line.h" 10 #include "base/command_line.h"
12 #include "base/i18n/time_formatting.h" 11 #include "base/i18n/time_formatting.h"
13 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
14 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/cert_store.h" 14 #include "chrome/browser/cert_store.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ssl/ssl_manager.h" 16 #include "chrome/browser/ssl/ssl_manager.h"
18 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
19 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
20 #include "net/base/cert_status_flags.h" 19 #include "net/base/cert_status_flags.h"
21 #include "net/base/ssl_connection_status_flags.h" 20 #include "net/base/ssl_connection_status_flags.h"
22 #include "net/base/ssl_cipher_suite_names.h" 21 #include "net/base/ssl_cipher_suite_names.h"
23 #include "net/base/x509_certificate.h" 22 #include "net/base/x509_certificate.h"
23 #include "ui/base/resource/resource_bundle.h"
24 24
25 #if defined(OS_MACOSX) 25 #if defined(OS_MACOSX)
26 #include "base/mac/mac_util.h" 26 #include "base/mac/mac_util.h"
27 #endif 27 #endif
28 28
29 PageInfoModel::PageInfoModel(Profile* profile, 29 PageInfoModel::PageInfoModel(Profile* profile,
30 const GURL& url, 30 const GURL& url,
31 const NavigationEntry::SSLStatus& ssl, 31 const NavigationEntry::SSLStatus& ssl,
32 bool show_history, 32 bool show_history,
33 PageInfoModelObserver* observer) 33 PageInfoModelObserver* observer)
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 gfx::NativeImage PageInfoModel::GetBitmapNamed(int resource_id) { 349 gfx::NativeImage PageInfoModel::GetBitmapNamed(int resource_id) {
350 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 350 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
351 gfx::NativeImage image = rb.GetNativeImageNamed(resource_id); 351 gfx::NativeImage image = rb.GetNativeImageNamed(resource_id);
352 #if defined(OS_MACOSX) 352 #if defined(OS_MACOSX)
353 // Unlike other platforms, the Mac ResourceBundle does not keep a shared image 353 // Unlike other platforms, the Mac ResourceBundle does not keep a shared image
354 // cache. These are released in the dtor. 354 // cache. These are released in the dtor.
355 base::mac::NSObjectRetain(image); 355 base::mac::NSObjectRetain(image);
356 #endif 356 #endif
357 return image; 357 return image;
358 } 358 }
OLDNEW
« no previous file with comments | « chrome/browser/omnibox_search_hint.cc ('k') | chrome/browser/password_manager_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698