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

Side by Side Diff: chrome/browser/ui/cocoa/about_window_controller.mm

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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #import "chrome/browser/ui/cocoa/about_window_controller.h" 5 #import "chrome/browser/ui/cocoa/about_window_controller.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/l10n_util_mac.h" 8 #include "app/l10n_util_mac.h"
9 #include "app/resource_bundle.h"
10 #include "base/logging.h" 9 #include "base/logging.h"
11 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
12 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
13 #include "base/string_util.h" 12 #include "base/string_util.h"
14 #include "base/sys_string_conversions.h" 13 #include "base/sys_string_conversions.h"
15 #include "chrome/browser/browser_list.h" 14 #include "chrome/browser/browser_list.h"
16 #include "chrome/browser/browser_window.h" 15 #include "chrome/browser/browser_window.h"
17 #include "chrome/browser/google/google_util.h" 16 #include "chrome/browser/google/google_util.h"
18 #include "chrome/browser/platform_util.h" 17 #include "chrome/browser/platform_util.h"
19 #import "chrome/browser/ui/cocoa/background_tile_view.h" 18 #import "chrome/browser/ui/cocoa/background_tile_view.h"
20 #import "chrome/browser/ui/cocoa/keystone_glue.h" 19 #import "chrome/browser/ui/cocoa/keystone_glue.h"
21 #include "chrome/browser/ui/cocoa/restart_browser.h" 20 #include "chrome/browser/ui/cocoa/restart_browser.h"
22 #include "chrome/common/url_constants.h" 21 #include "chrome/common/url_constants.h"
23 #include "grit/chromium_strings.h" 22 #include "grit/chromium_strings.h"
24 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
25 #include "grit/theme_resources.h" 24 #include "grit/theme_resources.h"
26 #include "grit/locale_settings.h" 25 #include "grit/locale_settings.h"
27 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 26 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
27 #include "ui/base/resource/resource_bundle.h"
28 28
29 namespace { 29 namespace {
30 30
31 void AttributedStringAppendString(NSMutableAttributedString* attr_str, 31 void AttributedStringAppendString(NSMutableAttributedString* attr_str,
32 NSString* str) { 32 NSString* str) {
33 // You might think doing [[attr_str mutableString] appendString:str] would 33 // You might think doing [[attr_str mutableString] appendString:str] would
34 // work, but it causes any trailing style to get extened, meaning as we 34 // work, but it causes any trailing style to get extened, meaning as we
35 // append links, they grow to include the new text, not what we want. 35 // append links, they grow to include the new text, not what we want.
36 NSAttributedString* new_attr_str = 36 NSAttributedString* new_attr_str =
37 [[[NSAttributedString alloc] initWithString:str] autorelease]; 37 [[[NSAttributedString alloc] initWithString:str] autorelease];
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 NSRange string_range = NSMakeRange(0, [legal_block length]); 755 NSRange string_range = NSMakeRange(0, [legal_block length]);
756 [legal_block addAttribute:NSFontAttributeName 756 [legal_block addAttribute:NSFontAttributeName
757 value:[NSFont labelFontOfSize:11] 757 value:[NSFont labelFontOfSize:11]
758 range:string_range]; 758 range:string_range];
759 759
760 [legal_block endEditing]; 760 [legal_block endEditing];
761 return legal_block; 761 return legal_block;
762 } 762 }
763 763
764 @end // @implementation AboutWindowController 764 @end // @implementation AboutWindowController
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_init.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698