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

Side by Side Diff: chrome/browser/chromeos/login/user_controller.h

Issue 7649015: Fix Chromium OS build break introduced in r96761. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/gtest_prod_util.h"
12 #include "base/string16.h" 13 #include "base/string16.h"
13 #include "base/task.h" 14 #include "base/task.h"
14 #include "chrome/browser/chromeos/login/new_user_view.h" 15 #include "chrome/browser/chromeos/login/new_user_view.h"
15 #include "chrome/browser/chromeos/login/user_manager.h" 16 #include "chrome/browser/chromeos/login/user_manager.h"
16 #include "chrome/browser/chromeos/login/user_view.h" 17 #include "chrome/browser/chromeos/login/user_view.h"
17 #include "chrome/browser/chromeos/wm_ipc.h" 18 #include "chrome/browser/chromeos/wm_ipc.h"
18 #include "testing/gtest/include/gtest/gtest_prod.h" 19 #include "testing/gtest/include/gtest/gtest_prod.h"
19 #include "views/widget/widget.h" 20 #include "views/widget/widget.h"
20 #include "views/widget/widget_delegate.h" 21 #include "views/widget/widget_delegate.h"
21 22
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 bool active) OVERRIDE; 136 bool active) OVERRIDE;
136 137
137 // Padding between the user windows. 138 // Padding between the user windows.
138 static const int kPadding; 139 static const int kPadding;
139 140
140 // Max size needed when an entry is not selected. 141 // Max size needed when an entry is not selected.
141 static const int kUnselectedSize; 142 static const int kUnselectedSize;
142 static const int kNewUserUnselectedSize; 143 static const int kNewUserUnselectedSize;
143 144
144 private: 145 private:
145 FRIEND_TEST(UserControllerTest, GetNameTooltip); 146 FRIEND_TEST_ALL_PREFIXES(UserControllerTest, GetNameTooltip);
146 147
147 class ControlsWidgetDelegate; 148 class ControlsWidgetDelegate;
148 149
149 // Performs common setup for login windows. 150 // Performs common setup for login windows.
150 void ConfigureAndShow(views::Widget* widget, 151 void ConfigureAndShow(views::Widget* widget,
151 int index, 152 int index,
152 chromeos::WmIpcWindowType type, 153 chromeos::WmIpcWindowType type,
153 views::View* contents_view); 154 views::View* contents_view);
154 void SetupControlsWidget(int index, 155 void SetupControlsWidget(int index,
155 int* width, 156 int* width,
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 225
225 // Whether name tooltip is enabled. 226 // Whether name tooltip is enabled.
226 bool name_tooltip_enabled_; 227 bool name_tooltip_enabled_;
227 228
228 DISALLOW_COPY_AND_ASSIGN(UserController); 229 DISALLOW_COPY_AND_ASSIGN(UserController);
229 }; 230 };
230 231
231 } // namespace chromeos 232 } // namespace chromeos
232 233
233 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_CONTROLLER_H_ 234 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698