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

Unified Diff: chrome/browser/chromeos/text_input/candidate_window.cc

Issue 1142005: Mocks for all libcros elements (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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
Index: chrome/browser/chromeos/text_input/candidate_window.cc
===================================================================
--- chrome/browser/chromeos/text_input/candidate_window.cc (revision 42341)
+++ chrome/browser/chromeos/text_input/candidate_window.cc (working copy)
@@ -19,7 +19,7 @@
#include "base/process_util.h"
#include "base/scoped_ptr.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/cros_library_loader.h"
#include "chrome/common/chrome_paths.h"
#include "gfx/canvas.h"
#include "gfx/font.h"
@@ -948,8 +948,10 @@
// Load libcros.
chrome::RegisterPathProvider(); // for libcros.so.
- CHECK(chromeos::CrosLibrary::EnsureLoaded())
- << "Failed to load libcros";
+ chromeos::CrosLibraryLoader lib_loader;
+ std::string error_string;
+ CHECK(lib_loader.Load(&error_string))
+ << "Failed to load libcros, " << error_string;
// Create the main message loop.
MessageLoop main_message_loop(MessageLoop::TYPE_UI);
« no previous file with comments | « chrome/browser/chromeos/status/power_menu_button.cc ('k') | chrome/browser/chromeos/text_input/text_input.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698