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

Unified Diff: chrome/browser/chromeos/input_method/candidate_window_main.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/frame/panel_controller.cc ('k') | chrome/browser/chromeos/login/background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/candidate_window_main.cc
===================================================================
--- chrome/browser/chromeos/input_method/candidate_window_main.cc (revision 72000)
+++ chrome/browser/chromeos/input_method/candidate_window_main.cc (working copy)
@@ -10,7 +10,6 @@
#include "app/app_paths.h"
#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/message_loop.h"
@@ -21,6 +20,8 @@
#include "chrome/common/chrome_switches.h"
#include "grit/app_locale_settings.h"
#include "third_party/cros/chromeos_cros_api.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
#include "views/focus/accelerator_handler.h"
int main(int argc, char** argv) {
@@ -33,6 +34,7 @@
base::AtExitManager exit_manager;
base::EnableTerminationOnHeapCorruption();
app::RegisterPathProvider();
+ ui::RegisterPathProvider();
CommandLine::Init(argc, argv);
// Check if the UI language code is passed from the command line,
« no previous file with comments | « chrome/browser/chromeos/frame/panel_controller.cc ('k') | chrome/browser/chromeos/login/background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698