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

Side by Side Diff: chrome/browser/browser_about_handler.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/background_mode_manager.cc ('k') | chrome/browser/browser_main.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) 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/browser_about_handler.h" 5 #include "chrome/browser/browser_about_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "app/resource_bundle.h"
13 #include "base/callback.h" 12 #include "base/callback.h"
14 #include "base/command_line.h" 13 #include "base/command_line.h"
15 #include "base/i18n/number_formatting.h" 14 #include "base/i18n/number_formatting.h"
16 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
17 #include "base/metrics/stats_table.h" 16 #include "base/metrics/stats_table.h"
18 #include "base/path_service.h" 17 #include "base/path_service.h"
19 #include "base/singleton.h" 18 #include "base/singleton.h"
20 #include "base/stringprintf.h" 19 #include "base/stringprintf.h"
21 #include "base/string_number_conversions.h" 20 #include "base/string_number_conversions.h"
22 #include "base/string_piece.h" 21 #include "base/string_piece.h"
(...skipping 25 matching lines...) Expand all
48 #include "chrome/common/net/gaia/google_service_auth_error.h" 47 #include "chrome/common/net/gaia/google_service_auth_error.h"
49 #include "chrome/common/render_messages.h" 48 #include "chrome/common/render_messages.h"
50 #include "chrome/common/url_constants.h" 49 #include "chrome/common/url_constants.h"
51 #include "googleurl/src/gurl.h" 50 #include "googleurl/src/gurl.h"
52 #include "grit/browser_resources.h" 51 #include "grit/browser_resources.h"
53 #include "grit/chromium_strings.h" 52 #include "grit/chromium_strings.h"
54 #include "grit/generated_resources.h" 53 #include "grit/generated_resources.h"
55 #include "grit/locale_settings.h" 54 #include "grit/locale_settings.h"
56 #include "webkit/glue/webkit_glue.h" 55 #include "webkit/glue/webkit_glue.h"
57 #include "net/base/escape.h" 56 #include "net/base/escape.h"
57 #include "ui/base/resource/resource_bundle.h"
58 #ifdef CHROME_V8 58 #ifdef CHROME_V8
59 #include "v8/include/v8.h" 59 #include "v8/include/v8.h"
60 #endif 60 #endif
61 61
62 #if defined(OS_WIN) 62 #if defined(OS_WIN)
63 #include "chrome/browser/enumerate_modules_model_win.h" 63 #include "chrome/browser/enumerate_modules_model_win.h"
64 #include "chrome/browser/ui/views/about_ipc_dialog.h" 64 #include "chrome/browser/ui/views/about_ipc_dialog.h"
65 #elif defined(OS_CHROMEOS) 65 #elif defined(OS_CHROMEOS)
66 #include "chrome/browser/chromeos/cros/cros_library.h" 66 #include "chrome/browser/chromeos/cros/cros_library.h"
67 #include "chrome/browser/chromeos/cros/network_library.h" 67 #include "chrome/browser/chromeos/cros/network_library.h"
(...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 // Run the dialog. This will re-use the existing one if it's already up. 1095 // Run the dialog. This will re-use the existing one if it's already up.
1096 AboutIPCDialog::RunDialog(); 1096 AboutIPCDialog::RunDialog();
1097 return true; 1097 return true;
1098 } 1098 }
1099 #endif 1099 #endif
1100 1100
1101 #endif // OFFICIAL_BUILD 1101 #endif // OFFICIAL_BUILD
1102 1102
1103 return false; 1103 return false;
1104 } 1104 }
OLDNEW
« no previous file with comments | « chrome/browser/background_mode_manager.cc ('k') | chrome/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698