diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 22:05:53 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 22:05:53 +0000 |
| commit | 1b2da8cc2ff36dd2dad578f4ef6dd27e0c82d796 (patch) | |
| tree | 64cd717c187ae6029b8a802ea8c42f568121f52a /views | |
| parent | f674d6c81c4fc9522592845cb7387065e5aa3fd3 (diff) | |
| download | chromium_src-1b2da8cc2ff36dd2dad578f4ef6dd27e0c82d796.zip chromium_src-1b2da8cc2ff36dd2dad578f4ef6dd27e0c82d796.tar.gz chromium_src-1b2da8cc2ff36dd2dad578f4ef6dd27e0c82d796.tar.bz2 | |
views: Remove the dependency on app_base.
BUG=72317
TEST=views_unittests, views_desktop, views_examples
R=sky@chromium.org,phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/7200022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/desktop/desktop_main.cc | 3 | ||||
| -rw-r--r-- | views/examples/examples_main.cc | 3 | ||||
| -rw-r--r-- | views/run_all_unittests.cc | 9 | ||||
| -rw-r--r-- | views/views.gyp | 1 |
4 files changed, 4 insertions, 12 deletions
diff --git a/views/desktop/desktop_main.cc b/views/desktop/desktop_main.cc index e37e954..54da0e6 100644 --- a/views/desktop/desktop_main.cc +++ b/views/desktop/desktop_main.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/app_paths.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/i18n/icu_util.h" @@ -35,9 +34,7 @@ int main(int argc, char** argv) { // The exit manager is in charge of calling the dtors of singleton objects. base::AtExitManager exit_manager; - app::RegisterPathProvider(); ui::RegisterPathProvider(); - icu_util::Initialize(); ResourceBundle::InitSharedInstance("en-US"); diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc index 2e95b65..395f772 100644 --- a/views/examples/examples_main.cc +++ b/views/examples/examples_main.cc @@ -4,7 +4,6 @@ #include "views/examples/examples_main.h" -#include "app/app_paths.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/i18n/icu_util.h" @@ -76,9 +75,7 @@ void ExamplesMain::Run() { // The exit manager is in charge of calling the dtors of singleton objects. base::AtExitManager exit_manager; - app::RegisterPathProvider(); ui::RegisterPathProvider(); - icu_util::Initialize(); ResourceBundle::InitSharedInstance("en-US"); diff --git a/views/run_all_unittests.cc b/views/run_all_unittests.cc index 9d68e16..90fd4dd 100644 --- a/views/run_all_unittests.cc +++ b/views/run_all_unittests.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/app_paths.h" #include "base/test/test_suite.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" @@ -14,10 +13,10 @@ class ViewTestSuite : public base::TestSuite { protected: virtual void Initialize() { - app::RegisterPathProvider(); - ui::RegisterPathProvider(); base::TestSuite::Initialize(); - ResourceBundle::InitSharedInstance("en-US"); + + ui::RegisterPathProvider(); + ui::ResourceBundle::InitSharedInstance("en-US"); #if defined(OS_LINUX) // Disable GPU browser compositor during unit tests. @@ -26,6 +25,6 @@ class ViewTestSuite : public base::TestSuite { } }; -int main(int argc, char **argv) { +int main(int argc, char** argv) { return ViewTestSuite(argc, argv).Run(); } diff --git a/views/views.gyp b/views/views.gyp index ef59248..772dbf3 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -61,7 +61,6 @@ 'target_name': 'views', 'type': 'static_library', 'dependencies': [ - '../app/app.gyp:app_base', '../app/app.gyp:app_resources', '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |