diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 00:04:18 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 00:04:18 +0000 |
| commit | b72dfb2453acef0ad31f5e60c5f7f46c9a72911b (patch) | |
| tree | 7ef0cbd68601b6c2b07daf3b0bdbe374802e0453 /ash/shell/shell_main.cc | |
| parent | 87d45969fc3e5f2340126ddeeaa79e1050764f19 (diff) | |
| download | chromium_src-b72dfb2453acef0ad31f5e60c5f7f46c9a72911b.zip chromium_src-b72dfb2453acef0ad31f5e60c5f7f46c9a72911b.tar.gz chromium_src-b72dfb2453acef0ad31f5e60c5f7f46c9a72911b.tar.bz2 | |
Split Aura shell initialization out by platform
Splits out Aura shell initialization code out to separate file
to support Mac-specific initialization.
BUG=109946
TEST=Proper initialization of Mac/Aura shell implementation.
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9231024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/shell_main.cc')
| -rw-r--r-- | ash/shell/shell_main.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc index 2276fb5..59a5cd0 100644 --- a/ash/shell/shell_main.cc +++ b/ash/shell/shell_main.cc @@ -8,11 +8,11 @@ #include "ash/shell_factory.h" #include "ash/shell_window_ids.h" #include "ash/shell/example_factory.h" +#include "ash/shell/shell_main_parts.h" #include "ash/shell/toplevel_window.h" #include "ash/wm/window_util.h" #include "base/at_exit.h" #include "base/command_line.h" -#include "base/i18n/icu_util.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "ui/aura/root_window.h" @@ -110,9 +110,7 @@ int main(int argc, char** argv) { // The exit manager is in charge of calling the dtors of singleton objects. base::AtExitManager exit_manager; - ui::RegisterPathProvider(); - icu_util::Initialize(); - ResourceBundle::InitSharedInstance("en-US"); + ash::shell::PreMainMessageLoopStart(); // Create the message-loop here before creating the root window. MessageLoop message_loop(MessageLoop::TYPE_UI); |