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

Side by Side Diff: chrome/browser/ui/views/about_chrome_view.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
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 #include "chrome/browser/ui/views/about_chrome_view.h" 5 #include "chrome/browser/ui/views/about_chrome_view.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <commdlg.h> 8 #include <commdlg.h>
9 #endif // defined(OS_WIN) 9 #endif // defined(OS_WIN)
10 10
11 #include <algorithm> 11 #include <algorithm>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "app/l10n_util.h" 15 #include "app/l10n_util.h"
16 #include "app/resource_bundle.h"
17 #include "base/callback.h" 16 #include "base/callback.h"
18 #include "base/i18n/rtl.h" 17 #include "base/i18n/rtl.h"
19 #include "base/string_number_conversions.h" 18 #include "base/string_number_conversions.h"
20 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
21 #include "base/win/windows_version.h" 20 #include "base/win/windows_version.h"
22 #include "chrome/browser/browser_list.h" 21 #include "chrome/browser/browser_list.h"
23 #include "chrome/browser/google/google_util.h" 22 #include "chrome/browser/google/google_util.h"
24 #include "chrome/browser/metrics/user_metrics.h" 23 #include "chrome/browser/metrics/user_metrics.h"
25 #include "chrome/browser/platform_util.h" 24 #include "chrome/browser/platform_util.h"
26 #include "chrome/browser/prefs/pref_service.h" 25 #include "chrome/browser/prefs/pref_service.h"
27 #include "chrome/browser/ui/views/accessible_view_helper.h" 26 #include "chrome/browser/ui/views/accessible_view_helper.h"
28 #include "chrome/browser/ui/views/window.h" 27 #include "chrome/browser/ui/views/window.h"
29 #include "chrome/common/chrome_constants.h" 28 #include "chrome/common/chrome_constants.h"
30 #include "chrome/common/chrome_version_info.h" 29 #include "chrome/common/chrome_version_info.h"
31 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
32 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
33 #include "chrome/installer/util/browser_distribution.h" 32 #include "chrome/installer/util/browser_distribution.h"
34 #include "gfx/canvas.h" 33 #include "gfx/canvas.h"
35 #include "grit/chromium_strings.h" 34 #include "grit/chromium_strings.h"
36 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
37 #include "grit/locale_settings.h" 36 #include "grit/locale_settings.h"
38 #include "grit/theme_resources.h" 37 #include "grit/theme_resources.h"
38 #include "ui/base/resource/resource_bundle.h"
39 #include "views/controls/textfield/textfield.h" 39 #include "views/controls/textfield/textfield.h"
40 #include "views/controls/throbber.h" 40 #include "views/controls/throbber.h"
41 #include "views/standard_layout.h" 41 #include "views/standard_layout.h"
42 #include "views/view_text_utils.h" 42 #include "views/view_text_utils.h"
43 #include "views/widget/widget.h" 43 #include "views/widget/widget.h"
44 #include "views/window/window.h" 44 #include "views/window/window.h"
45 #include "webkit/glue/webkit_glue.h" 45 #include "webkit/glue/webkit_glue.h"
46 46
47 #if defined(OS_WIN) 47 #if defined(OS_WIN)
48 #include "base/win/win_util.h" 48 #include "base/win/win_util.h"
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 View* parent = GetParent(); 833 View* parent = GetParent();
834 parent->Layout(); 834 parent->Layout();
835 835
836 // Check button may have appeared/disappeared. We cannot call this during 836 // Check button may have appeared/disappeared. We cannot call this during
837 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet. 837 // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
838 if (window()) 838 if (window())
839 GetDialogClientView()->UpdateDialogButtons(); 839 GetDialogClientView()->UpdateDialogButtons();
840 } 840 }
841 841
842 #endif 842 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698