chrome/browser/chromeos/login/background_view.cc - Issue 6312156: Change includes of gfx/* to ui/gfx/*

Side by Side Diff: chrome/browser/chromeos/login/background_view.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 10 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/input_method/candidate_window.cc ('k') | chrome/browser/chromeos/login/camera.cc » ('j') | no next file with comments »

OLD	NEW
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 #include "chrome/browser/chromeos/login/background_view.h"	5 #include "chrome/browser/chromeos/login/background_view.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/string16.h"	10 #include "base/string16.h"

11 #include "base/string_util.h"	11 #include "base/string_util.h"

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

13 #include "base/utf_string_conversions.h"	13 #include "base/utf_string_conversions.h"

14 #include "chrome/browser/chromeos/login/helper.h"	14 #include "chrome/browser/chromeos/login/helper.h"

15 #include "chrome/browser/chromeos/login/login_utils.h"	15 #include "chrome/browser/chromeos/login/login_utils.h"

16 #include "chrome/browser/chromeos/login/oobe_progress_bar.h"	16 #include "chrome/browser/chromeos/login/oobe_progress_bar.h"

17 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"	17 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"

18 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"	18 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"

19 #include "chrome/browser/chromeos/login/shutdown_button.h"	19 #include "chrome/browser/chromeos/login/shutdown_button.h"

20 #include "chrome/browser/chromeos/login/wizard_controller.h"	20 #include "chrome/browser/chromeos/login/wizard_controller.h"

21 #include "chrome/browser/chromeos/status/clock_menu_button.h"	21 #include "chrome/browser/chromeos/status/clock_menu_button.h"

22 #include "chrome/browser/chromeos/status/input_method_menu_button.h"	22 #include "chrome/browser/chromeos/status/input_method_menu_button.h"

23 #include "chrome/browser/chromeos/status/network_menu_button.h"	23 #include "chrome/browser/chromeos/status/network_menu_button.h"

24 #include "chrome/browser/chromeos/status/status_area_view.h"	24 #include "chrome/browser/chromeos/status/status_area_view.h"

25 #include "chrome/browser/chromeos/wm_ipc.h"	25 #include "chrome/browser/chromeos/wm_ipc.h"

26 #include "chrome/browser/profiles/profile_manager.h"	26 #include "chrome/browser/profiles/profile_manager.h"

27 #include "chrome/browser/ui/views/dom_view.h"	27 #include "chrome/browser/ui/views/dom_view.h"

28 #include "chrome/browser/ui/views/window.h"	28 #include "chrome/browser/ui/views/window.h"

29 #include "gfx/gtk_util.h"

30 #include "googleurl/src/gurl.h"	29 #include "googleurl/src/gurl.h"

31 #include "grit/chromium_strings.h"	30 #include "grit/chromium_strings.h"

32 #include "grit/generated_resources.h"	31 #include "grit/generated_resources.h"

33 #include "grit/theme_resources.h"	32 #include "grit/theme_resources.h"

34 #include "third_party/cros/chromeos_wm_ipc_enums.h"	33 #include "third_party/cros/chromeos_wm_ipc_enums.h"

35 #include "ui/base/l10n/l10n_util.h"	34 #include "ui/base/l10n/l10n_util.h"

36 #include "ui/base/resource/resource_bundle.h"	35 #include "ui/base/resource/resource_bundle.h"

37 #include "ui/base/x/x11_util.h"	36 #include "ui/base/x/x11_util.h"

	37 #include "ui/gfx/gtk_util.h"

38 #include "views/controls/button/text_button.h"	38 #include "views/controls/button/text_button.h"

39 #include "views/controls/label.h"	39 #include "views/controls/label.h"

40 #include "views/screen.h"	40 #include "views/screen.h"

41 #include "views/widget/widget_gtk.h"	41 #include "views/widget/widget_gtk.h"

42 #include "views/window/window.h"	42 #include "views/window/window.h"

43	43

44 // X Windows headers have "#define Status int". That interferes with	44 // X Windows headers have "#define Status int". That interferes with

45 // NetworkLibrary header which defines enum "Status".	45 // NetworkLibrary header which defines enum "Status".

46 #include <X11/cursorfont.h> // NOLINT	46 #include <X11/cursorfont.h> // NOLINT

47 #include <X11/Xcursor/Xcursor.h> // NOLINT	47 #include <X11/Xcursor/Xcursor.h> // NOLINT

(...skipping 396 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
444 kBootTimesNoChromeExec,	444 kBootTimesNoChromeExec,

445 boot_times.total,	445 boot_times.total,

446 boot_times.pre_startup,	446 boot_times.pre_startup,

447 boot_times.system);	447 boot_times.system);

448 }	448 }

449 // Use UTF8ToWide once this string is localized.	449 // Use UTF8ToWide once this string is localized.

450 boot_times_label_->SetText(ASCIIToWide(boot_times_text));	450 boot_times_label_->SetText(ASCIIToWide(boot_times_text));

451 }	451 }

452	452

453 } // namespace chromeos	453 } // namespace chromeos

OLD	NEW