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

Side by Side 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:
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/options/preferences_window_controller.h" 5 #import "chrome/browser/ui/cocoa/options/preferences_window_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/l10n_util_mac.h" 10 #include "app/l10n_util_mac.h"
11 #include "app/resource_bundle.h"
12 #include "base/logging.h" 11 #include "base/logging.h"
13 #include "base/mac/mac_util.h" 12 #include "base/mac/mac_util.h"
14 #include "base/mac/scoped_aedesc.h" 13 #include "base/mac/scoped_aedesc.h"
15 #include "base/string16.h" 14 #include "base/string16.h"
16 #include "base/string_util.h" 15 #include "base/string_util.h"
17 #include "base/sys_string_conversions.h" 16 #include "base/sys_string_conversions.h"
18 #include "chrome/browser/autofill/autofill_dialog.h" 17 #include "chrome/browser/autofill/autofill_dialog.h"
19 #include "chrome/browser/autofill/autofill_type.h" 18 #include "chrome/browser/autofill/autofill_type.h"
20 #include "chrome/browser/autofill/personal_data_manager.h" 19 #include "chrome/browser/autofill/personal_data_manager.h"
21 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "chrome/common/notification_type.h" 57 #include "chrome/common/notification_type.h"
59 #include "chrome/common/pref_names.h" 58 #include "chrome/common/pref_names.h"
60 #include "chrome/common/url_constants.h" 59 #include "chrome/common/url_constants.h"
61 #include "chrome/installer/util/google_update_settings.h" 60 #include "chrome/installer/util/google_update_settings.h"
62 #include "grit/chromium_strings.h" 61 #include "grit/chromium_strings.h"
63 #include "grit/generated_resources.h" 62 #include "grit/generated_resources.h"
64 #include "grit/locale_settings.h" 63 #include "grit/locale_settings.h"
65 #include "grit/theme_resources.h" 64 #include "grit/theme_resources.h"
66 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 65 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
67 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 66 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
67 #include "ui/base/resource/resource_bundle.h"
68 68
69 namespace { 69 namespace {
70 70
71 // Colors for the managed preferences warning banner. 71 // Colors for the managed preferences warning banner.
72 static const double kBannerGradientColorTop[3] = 72 static const double kBannerGradientColorTop[3] =
73 {255.0 / 255.0, 242.0 / 255.0, 183.0 / 255.0}; 73 {255.0 / 255.0, 242.0 / 255.0, 183.0 / 255.0};
74 static const double kBannerGradientColorBottom[3] = 74 static const double kBannerGradientColorBottom[3] =
75 {250.0 / 255.0, 230.0 / 255.0, 145.0 / 255.0}; 75 {250.0 / 255.0, 230.0 / 255.0, 145.0 / 255.0};
76 static const double kBannerStrokeColor = 135.0 / 255.0; 76 static const double kBannerStrokeColor = 135.0 / 255.0;
77 77
(...skipping 2086 matching lines...) Expand 10 before | Expand all | Expand 10 after
2164 case OPTIONS_PAGE_ADVANCED: 2164 case OPTIONS_PAGE_ADVANCED:
2165 return underTheHoodView_; 2165 return underTheHoodView_;
2166 case OPTIONS_PAGE_DEFAULT: 2166 case OPTIONS_PAGE_DEFAULT:
2167 case OPTIONS_PAGE_COUNT: 2167 case OPTIONS_PAGE_COUNT:
2168 LOG(DFATAL) << "Invalid page value " << page; 2168 LOG(DFATAL) << "Invalid page value " << page;
2169 } 2169 }
2170 return basicsView_; 2170 return basicsView_;
2171 } 2171 }
2172 2172
2173 @end 2173 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm ('k') | chrome/browser/ui/cocoa/sad_tab_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698