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

Unified Diff: chromecast/shell/app/cast_main_delegate.cc

Issue 469023004: Chromecast: moves cast_shell.pak output to assets/ directory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 4 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
« chromecast/chromecast.gyp ('K') | « chromecast/common/cast_paths.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/shell/app/cast_main_delegate.cc
diff --git a/chromecast/shell/app/cast_main_delegate.cc b/chromecast/shell/app/cast_main_delegate.cc
index 4d3284d8bac951432173be3a2839d81204749fb8..1fb2ad773a4aa763e804c46b4fa40983bd7070a7 100644
--- a/chromecast/shell/app/cast_main_delegate.cc
+++ b/chromecast/shell/app/cast_main_delegate.cc
@@ -4,7 +4,6 @@
#include "chromecast/shell/app/cast_main_delegate.h"
-#include "base/base_paths.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "chromecast/common/cast_paths.h"
@@ -52,10 +51,10 @@ void CastMainDelegate::InitializeResourceBundle() {
resource_delegate_.get(),
ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
- base::FilePath pak_dir;
- PathService::Get(base::DIR_MODULE, &pak_dir);
+ base::FilePath pak_file;
+ CHECK(PathService::Get(FILE_CAST_PAK, &pak_file));
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
- pak_dir.Append(FILE_PATH_LITERAL("cast_shell.pak")),
+ pak_file,
ui::SCALE_FACTOR_NONE);
}
« chromecast/chromecast.gyp ('K') | « chromecast/common/cast_paths.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698