Use 'cobalt' instead of 'content_shell' for logging and paths. #4292
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
jellefoks
force-pushed
the
poor_mans_cobalt_separate_storage
branch
12 times, most recently
from
b80d454
to
ecd4f1e
Compare
| @@ -211,6 +211,11 @@ namespace chrome_cleaner { | |||
| class ResetShortcutsComponent; | |||
| class SystemReportComponent; | |||
| } // namespace chrome_cleaner | |||
| #if BUILDFLAG(IS_COBALT) | |||
| namespace cobalt { | |||
| class CobaltPathProvider; | |||
There was a problem hiding this comment.
@niranjanyardi Did you look into a starboard-centric way this should be done? Should we create a follow up bug for you to look at potentially changing this or are you fine with this solution? (either way, I think it should be submitted as is)
There was a problem hiding this comment.
The needed changes here is what I brought up in the chat, and this was the suggested approach. I'm not aware of a followup. This mirrors occurences of ShellPathProvider in this file, plus the #if to mark our changes to help with rebasing.
There was a problem hiding this comment.
My understanding of the dependencies and of the chat is that it'd make more sense to me to see USE_STARBOARD here, and define the paths in Starboard.
There was a problem hiding this comment.
As I said in the chat: This is not something needed for Starboard, but for Cobalt. You can currently build cobalt without Starboard, and changing that here would break that unnecessarily
Now sometime in the future that, the paths may likely be provided by Starboard, and then the class can be renamed to StarboardPathProvider and this can be changed. However, that is currently not the case.
jellefoks
force-pushed
the
poor_mans_cobalt_separate_storage
branch
from
ecd4f1e
to
c7e054a
Compare
This changes the paths and the default log file to 'cobalt' instead of 'content_shell'. With this PR, the local storage for the `cobalt` target on linux will be `~/.config/cobalt` b/375193856 b/374191454
jellefoks
force-pushed
the
poor_mans_cobalt_separate_storage
branch
from
a119a64
to
6468509
Compare
| @@ -0,0 +1,27 @@ | |||
| // Copyright 2021 The Chromium Authors | |||
There was a problem hiding this comment.
I'm not 100% on this, but I assume we'd want a Cobalt copyright on the forked code
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #ifndef CONTENT_SHELL_BROWSER_SHELL_PATHS_H_ |
There was a problem hiding this comment.
I assume we want to rename the header guard here
| #include "content/public/common/content_switches.h" | ||
| #include "content/shell/common/shell_switches.h" | ||
|
|
||
| #if !BUILDFLAG(IS_ANDROID) |
There was a problem hiding this comment.
How are these headers used? I'm confused because I don't see any linux-specifc code added, just android-specific code
| // Directory where user data can be written. | ||
| SHELL_DIR_USER_DATA = SHELL_PATH_START, | ||
|
|
||
| // TODO(jam): move from content/common since it's test only. |
There was a problem hiding this comment.
Should we get rid of the TODO comment from upstream?
This changes the paths and the default log file to 'cobalt' instead of
'content_shell'.
With this PR, the local storage for the
cobalttarget on linux will be~/.config/cobaltb/375193856
b/374191454