chrome/browser/chromeos/ui/idle_logout_dialog_view.cc - Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/ui/idle_logout_dialog_view.cc

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix build Created 6 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 | « chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "chrome/browser/chromeos/ui/idle_logout_dialog_view.h"	5 #include "chrome/browser/chromeos/ui/idle_logout_dialog_view.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "base/bind.h"	8 #include "base/bind.h"

9 #include "base/bind_helpers.h"	9 #include "base/bind_helpers.h"

10 #include "base/strings/string_number_conversions.h"	10 #include "base/strings/string_number_conversions.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "base/time/time.h"	12 #include "base/time/time.h"

13 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"	13 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

14 #include "chrome/browser/ui/browser_list.h"	14 #include "chrome/browser/ui/browser_list.h"

	15 #include "chrome/grit/generated_resources.h"

15 #include "chromeos/dbus/dbus_thread_manager.h"	16 #include "chromeos/dbus/dbus_thread_manager.h"

16 #include "chromeos/dbus/session_manager_client.h"	17 #include "chromeos/dbus/session_manager_client.h"

17 #include "grit/generated_resources.h"

18 #include "ui/aura/window_event_dispatcher.h"	18 #include "ui/aura/window_event_dispatcher.h"

19 #include "ui/base/l10n/l10n_util.h"	19 #include "ui/base/l10n/l10n_util.h"

20 #include "ui/views/controls/label.h"	20 #include "ui/views/controls/label.h"

21 #include "ui/views/layout/grid_layout.h"	21 #include "ui/views/layout/grid_layout.h"

22 #include "ui/views/layout/layout_constants.h"	22 #include "ui/views/layout/layout_constants.h"

23 #include "ui/views/widget/widget.h"	23 #include "ui/views/widget/widget.h"

24	24

25 namespace {	25 namespace {

26	26

27 // Global singleton instance of our dialog class.	27 // Global singleton instance of our dialog class.

(...skipping 168 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
196 return g_instance;	196 return g_instance;

197 }	197 }

198	198

199 // static	199 // static

200 void IdleLogoutDialogView::set_settings_provider(	200 void IdleLogoutDialogView::set_settings_provider(

201 IdleLogoutSettingsProvider* provider) {	201 IdleLogoutSettingsProvider* provider) {

202 provider_ = provider;	202 provider_ = provider;

203 }	203 }

204	204

205 } // namespace chromeos	205 } // namespace chromeos

OLD	NEW