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

Side by Side Diff: mash/quick_launch/quick_launch_application.cc

Issue 1770533002: Change userid from a uint32_t to a string guid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@33connector
Patch Set: . Created 4 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 unified diff | Download patch
« no previous file with comments | « mash/quick_launch/quick_launch_application.h ('k') | mash/screenlock/screenlock.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mash/quick_launch/quick_launch_application.h" 5 #include "mash/quick_launch/quick_launch_application.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "mojo/public/c/system/main.h" 10 #include "mojo/public/c/system/main.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 std::vector<scoped_ptr<mojo::Connection>> connections_; 83 std::vector<scoped_ptr<mojo::Connection>> connections_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(QuickLaunchUI); 85 DISALLOW_COPY_AND_ASSIGN(QuickLaunchUI);
86 }; 86 };
87 87
88 QuickLaunchApplication::QuickLaunchApplication() {} 88 QuickLaunchApplication::QuickLaunchApplication() {}
89 QuickLaunchApplication::~QuickLaunchApplication() {} 89 QuickLaunchApplication::~QuickLaunchApplication() {}
90 90
91 void QuickLaunchApplication::Initialize(mojo::Connector* connector, 91 void QuickLaunchApplication::Initialize(mojo::Connector* connector,
92 const std::string& url, 92 const std::string& url,
93 uint32_t id, 93 const std::string& user_id,
94 uint32_t user_id) { 94 uint32_t id) {
95 tracing_.Initialize(connector, url); 95 tracing_.Initialize(connector, url);
96 96
97 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); 97 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
98 views::WindowManagerConnection::Create(connector); 98 views::WindowManagerConnection::Create(connector);
99 99
100 views::Widget* window = views::Widget::CreateWindowWithBounds( 100 views::Widget* window = views::Widget::CreateWindowWithBounds(
101 new QuickLaunchUI(connector), gfx::Rect(10, 640, 0, 0)); 101 new QuickLaunchUI(connector), gfx::Rect(10, 640, 0, 0));
102 window->Show(); 102 window->Show();
103 } 103 }
104 104
105 bool QuickLaunchApplication::AcceptConnection(mojo::Connection* connection) { 105 bool QuickLaunchApplication::AcceptConnection(mojo::Connection* connection) {
106 return true; 106 return true;
107 } 107 }
108 108
109 } // namespace quick_launch 109 } // namespace quick_launch
110 } // namespace mash 110 } // namespace mash
OLDNEW
« no previous file with comments | « mash/quick_launch/quick_launch_application.h ('k') | mash/screenlock/screenlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698