chrome/browser/ui/cocoa/options/preferences_window_controller.mm - Issue 6263008: Move ResourceBundle, DataPack to ui/base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/options/preferences_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:

Index: chrome/browser/ui/cocoa/options/preferences_window_controller.mm

===================================================================

--- chrome/browser/ui/cocoa/options/preferences_window_controller.mm (revision 72000)

+++ chrome/browser/ui/cocoa/options/preferences_window_controller.mm (working copy)

@@ -8,7 +8,6 @@

#include "app/l10n_util.h"

#include "app/l10n_util_mac.h"

-#include "app/resource_bundle.h"

#include "base/logging.h"

#include "base/mac/mac_util.h"

#include "base/mac/scoped_aedesc.h"

@@ -65,6 +64,7 @@

#include "grit/theme_resources.h"

#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"

#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"

+#include "ui/base/resource/resource_bundle.h"

namespace {