diff options
| author | ben <ben@chromium.org> | 2016-03-05 08:54:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-05 16:55:47 +0000 |
| commit | cccfe2ac0e74379a36ce020db5c08c3ccffdd362 (patch) | |
| tree | 7b743925a0ab636ed21980067ac53fdefd7bd1ab /components/font_service | |
| parent | 9b87f72d46de40949404f9754db8eab87000d645 (diff) | |
| download | chromium_src-cccfe2ac0e74379a36ce020db5c08c3ccffdd362.zip chromium_src-cccfe2ac0e74379a36ce020db5c08c3ccffdd362.tar.gz chromium_src-cccfe2ac0e74379a36ce020db5c08c3ccffdd362.tar.bz2 | |
Change userid from a uint32_t to a string guid
TBR=sky@chromium.org
BUG=
patch from issue 1760963003 at patchset 20001 (http://crrev.com/1760963003#ps20001)
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1770533002
Cr-Commit-Position: refs/heads/master@{#379476}
Diffstat (limited to 'components/font_service')
| -rw-r--r-- | components/font_service/font_service_app.cc | 2 | ||||
| -rw-r--r-- | components/font_service/font_service_app.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/font_service/font_service_app.cc b/components/font_service/font_service_app.cc index d599b09..d0c0c1c 100644 --- a/components/font_service/font_service_app.cc +++ b/components/font_service/font_service_app.cc @@ -60,7 +60,7 @@ FontServiceApp::~FontServiceApp() {} void FontServiceApp::Initialize(mojo::Connector* connector, const std::string& url, - uint32_t id, uint32_t user_id) { + const std::string& user_id, uint32_t id) { tracing_.Initialize(connector, url); } diff --git a/components/font_service/font_service_app.h b/components/font_service/font_service_app.h index 71d29cc..52b1f03 100644 --- a/components/font_service/font_service_app.h +++ b/components/font_service/font_service_app.h @@ -28,7 +28,7 @@ class FontServiceApp : public mojo::ShellClient, private: // mojo::ShellClient: void Initialize(mojo::Connector* connector, const std::string& url, - uint32_t id, uint32_t user_id) override; + const std::string& user_id, uint32_t id) override; bool AcceptConnection(mojo::Connection* connection) override; // mojo::InterfaceFactory<FontService>: |