| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/chromeos/input_method/candidate_window.h" | 5 #include "chrome/browser/chromeos/input_method/candidate_window.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "app/app_paths.h" | 11 #include "app/app_paths.h" |
| 12 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" |
| 13 #include "app/resource_bundle.h" | 13 #include "app/resource_bundle.h" |
| 14 #include "base/at_exit.h" | 14 #include "base/at_exit.h" |
| 15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
| 16 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
| 17 #include "base/path_service.h" | 17 #include "base/path_service.h" |
| 18 #include "base/process_util.h" | 18 #include "base/process_util.h" |
| 19 #include "chrome/browser/chromeos/cros/cros_library_loader.h" | 19 #include "chrome/browser/chromeos/cros/cros_library_loader.h" |
| 20 #include "chrome/common/chrome_paths.h" | 20 #include "chrome/common/chrome_paths.h" |
| 21 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
| 22 #include "cros/chromeos_cros_api.h" | |
| 23 #include "grit/app_locale_settings.h" | 22 #include "grit/app_locale_settings.h" |
| 23 #include "third_party/cros/chromeos_cros_api.h" |
| 24 #include "views/focus/accelerator_handler.h" | 24 #include "views/focus/accelerator_handler.h" |
| 25 | 25 |
| 26 int main(int argc, char** argv) { | 26 int main(int argc, char** argv) { |
| 27 // Initialize gtk stuff. | 27 // Initialize gtk stuff. |
| 28 g_thread_init(NULL); | 28 g_thread_init(NULL); |
| 29 g_type_init(); | 29 g_type_init(); |
| 30 gtk_init(&argc, &argv); | 30 gtk_init(&argc, &argv); |
| 31 | 31 |
| 32 // Initialize Chrome stuff. | 32 // Initialize Chrome stuff. |
| 33 base::AtExitManager exit_manager; | 33 base::AtExitManager exit_manager; |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 if (!controller.Init()) { | 71 if (!controller.Init()) { |
| 72 return 1; | 72 return 1; |
| 73 } | 73 } |
| 74 | 74 |
| 75 // Start the main loop. | 75 // Start the main loop. |
| 76 views::AcceleratorHandler accelerator_handler; | 76 views::AcceleratorHandler accelerator_handler; |
| 77 MessageLoopForUI::current()->Run(&accelerator_handler); | 77 MessageLoopForUI::current()->Run(&accelerator_handler); |
| 78 | 78 |
| 79 return 0; | 79 return 0; |
| 80 } | 80 } |
| OLD | NEW |