summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/options
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-05 02:05:11 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-05 02:05:11 +0000
commit9929da90886e2df0c91810766cf09b4b110218c6 (patch)
treee94f246a0c6305e7d2f9e594d0c73191fe5ac3b1 /chrome/browser/views/options
parent58956203f3268d5b4642a8ad586fdd66ad7d9375 (diff)
downloadchromium_src-9929da90886e2df0c91810766cf09b4b110218c6.zip
chromium_src-9929da90886e2df0c91810766cf09b4b110218c6.tar.gz
chromium_src-9929da90886e2df0c91810766cf09b4b110218c6.tar.bz2
Adds toplevel app/ directory and moves ResourceBundle into it.
No changes to resource bundle yet, just the move to keep this CL as compact as possible. Adds new vcproj and gyp file for app dir. http://crbug.com/11387 Review URL: http://codereview.chromium.org/100354 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options')
-rw-r--r--chrome/browser/views/options/advanced_contents_view.cc2
-rw-r--r--chrome/browser/views/options/content_page_view.cc2
-rw-r--r--chrome/browser/views/options/cookies_view.cc2
-rw-r--r--chrome/browser/views/options/fonts_languages_window_view.cc2
-rw-r--r--chrome/browser/views/options/fonts_page_view.cc7
-rw-r--r--chrome/browser/views/options/general_page_view.cc2
-rw-r--r--chrome/browser/views/options/languages_page_view.cc2
-rw-r--r--chrome/browser/views/options/options_group_view.cc2
-rw-r--r--chrome/browser/views/options/options_window_view.cc2
9 files changed, 12 insertions, 11 deletions
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 3063339..52cdd16 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -12,6 +12,7 @@
#include <vsstyle.h>
#include <vssym32.h>
+#include "app/resource_bundle.h"
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/gfx/native_theme.h"
@@ -31,7 +32,6 @@
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/pref_member.h"
#include "chrome/common/pref_names.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/installer/util/google_update_settings.h"
#include "chrome/views/background.h"
#include "chrome/views/controls/button/checkbox.h"
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 7263505..e0cc572 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/views/options/content_page_view.h"
+#include "app/resource_bundle.h"
#include "base/file_util.h"
#include "base/gfx/native_theme.h"
#include "chrome/browser/browser_process.h"
@@ -21,7 +22,6 @@
#include "chrome/common/l10n_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/views/controls/button/radio_button.h"
#include "chrome/views/controls/text_field.h"
#include "chrome/views/grid_layout.h"
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index f5c0a68..6d66800 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/views/options/cookies_view.h"
+#include "app/resource_bundle.h"
#include "base/string_util.h"
#include "base/time_format.h"
#include "chrome/browser/profile.h"
@@ -13,7 +14,6 @@
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/gfx/color_utils.h"
#include "chrome/common/l10n_util.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/common/win_util.h"
#include "chrome/views/border.h"
#include "chrome/views/grid_layout.h"
diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc
index fd8ef61..36fbaf2 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.cc
+++ b/chrome/browser/views/options/fonts_languages_window_view.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/views/options/fonts_languages_window_view.h"
+#include "app/resource_bundle.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/views/options/fonts_page_view.h"
#include "chrome/browser/views/options/languages_page_view.h"
@@ -11,7 +12,6 @@
#include "chrome/common/l10n_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/views/window/window.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index c787704..f7be657 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -1,6 +1,9 @@
// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+
+#include "chrome/browser/views/options/fonts_page_view.h"
+
#include <windows.h>
#include <shlobj.h>
#include <vsstyle.h>
@@ -8,8 +11,7 @@
#include <vector>
-#include "chrome/browser/views/options/fonts_page_view.h"
-
+#include "app/resource_bundle.h"
#include "base/file_util.h"
#include "base/gfx/native_theme.h"
#include "base/string_util.h"
@@ -22,7 +24,6 @@
#include "chrome/common/l10n_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/views/controls/button/native_button.h"
#include "chrome/views/controls/text_field.h"
#include "chrome/views/grid_layout.h"
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index 4fd0801..229f93a 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/views/options/general_page_view.h"
+#include "app/resource_bundle.h"
#include "base/gfx/png_decoder.h"
#include "base/message_loop.h"
#include "base/string_util.h"
@@ -27,7 +28,6 @@
#include "chrome/common/l10n_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/common/url_constants.h"
#include "chrome/views/controls/button/radio_button.h"
#include "chrome/views/controls/label.h"
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index e8d968d..42e5b89 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/views/options/languages_page_view.h"
+#include "app/resource_bundle.h"
#include "base/file_util.h"
#include "base/string_util.h"
#include "base/gfx/native_theme.h"
@@ -23,7 +24,6 @@
#include "chrome/common/l10n_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/views/controls/button/radio_button.h"
#include "chrome/views/controls/combo_box.h"
#include "chrome/views/controls/tabbed_pane.h"
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index c666f2a..2302eec 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -7,12 +7,12 @@
#include "chrome/browser/views/options/options_group_view.h"
+#include "app/resource_bundle.h"
#include "base/gfx/native_theme.h"
#include "chrome/browser/views/standard_layout.h"
#include "chrome/common/gfx/chrome_font.h"
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/l10n_util.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/views/grid_layout.h"
#include "chrome/views/controls/label.h"
#include "chrome/views/controls/separator.h"
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc
index d163640..8b40893 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/options_window.h"
+#include "app/resource_bundle.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/views/options/advanced_page_view.h"
@@ -13,7 +14,6 @@
#include "chrome/common/l10n_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
-#include "chrome/common/resource_bundle.h"
#ifdef CHROME_PERSONALIZATION
#include "chrome/personalization/personalization.h"
#include "chrome/personalization/views/user_data_page_view.h"