Merge remote-tracking branch 'origin/master' into roller/chromium-ad1b791122c04bd91b825fbfbdf1ff4da82a0edb-1558011686736
This commit is contained in:
commit
ca283c74c9
64 changed files with 2026 additions and 3216 deletions
|
@ -157,6 +157,7 @@ class App : public AtomBrowserClient::Delegate,
|
|||
bool* no_javascript_access) override;
|
||||
|
||||
// content::GpuDataManagerObserver:
|
||||
void OnGpuInfoUpdate() override;
|
||||
void OnGpuProcessCrashed(base::TerminationStatus status) override;
|
||||
|
||||
// content::BrowserChildProcessObserver:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue