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

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

Issue 5854003: Remove CrOS hack from ppapi.gyp that made the include directories work. This... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/l10n_util.h" 10 #include "app/l10n_util.h"
11 #include "app/resource_bundle.h" 11 #include "app/resource_bundle.h"
12 #include "app/x11_util.h" 12 #include "app/x11_util.h"
13 #include "base/string16.h" 13 #include "base/string16.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/stringprintf.h" 15 #include "base/stringprintf.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/chromeos/login/helper.h" 17 #include "chrome/browser/chromeos/login/helper.h"
18 #include "chrome/browser/chromeos/login/oobe_progress_bar.h" 18 #include "chrome/browser/chromeos/login/oobe_progress_bar.h"
19 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h" 19 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
20 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" 20 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
21 #include "chrome/browser/chromeos/login/shutdown_button.h" 21 #include "chrome/browser/chromeos/login/shutdown_button.h"
22 #include "chrome/browser/chromeos/login/wizard_controller.h" 22 #include "chrome/browser/chromeos/login/wizard_controller.h"
23 #include "chrome/browser/chromeos/status/clock_menu_button.h" 23 #include "chrome/browser/chromeos/status/clock_menu_button.h"
24 #include "chrome/browser/chromeos/status/input_method_menu_button.h" 24 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
25 #include "chrome/browser/chromeos/status/network_menu_button.h" 25 #include "chrome/browser/chromeos/status/network_menu_button.h"
26 #include "chrome/browser/chromeos/status/status_area_view.h" 26 #include "chrome/browser/chromeos/status/status_area_view.h"
27 #include "chrome/browser/chromeos/wm_ipc.h" 27 #include "chrome/browser/chromeos/wm_ipc.h"
28 #include "chrome/browser/profiles/profile_manager.h" 28 #include "chrome/browser/profiles/profile_manager.h"
29 #include "chrome/browser/views/dom_view.h" 29 #include "chrome/browser/views/dom_view.h"
30 #include "cros/chromeos_wm_ipc_enums.h" 30 #include "gfx/gtk_util.h"
31 #include "googleurl/src/gurl.h" 31 #include "googleurl/src/gurl.h"
32 #include "gfx/gtk_util.h"
33 #include "grit/chromium_strings.h" 32 #include "grit/chromium_strings.h"
34 #include "grit/generated_resources.h" 33 #include "grit/generated_resources.h"
35 #include "grit/theme_resources.h" 34 #include "grit/theme_resources.h"
35 #include "third_party/cros/chromeos_wm_ipc_enums.h"
36 #include "views/controls/button/text_button.h" 36 #include "views/controls/button/text_button.h"
37 #include "views/controls/label.h" 37 #include "views/controls/label.h"
38 #include "views/screen.h" 38 #include "views/screen.h"
39 #include "views/widget/widget_gtk.h" 39 #include "views/widget/widget_gtk.h"
40 40
41 // X Windows headers have "#define Status int". That interferes with 41 // X Windows headers have "#define Status int". That interferes with
42 // NetworkLibrary header which defines enum "Status". 42 // NetworkLibrary header which defines enum "Status".
43 #include <X11/cursorfont.h> // NOLINT 43 #include <X11/cursorfont.h> // NOLINT
44 #include <X11/Xcursor/Xcursor.h> // NOLINT 44 #include <X11/Xcursor/Xcursor.h> // NOLINT
45 45
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 kBootTimesNoChromeExec, 436 kBootTimesNoChromeExec,
437 boot_times.total, 437 boot_times.total,
438 boot_times.pre_startup, 438 boot_times.pre_startup,
439 boot_times.system); 439 boot_times.system);
440 } 440 }
441 // Use UTF8ToWide once this string is localized. 441 // Use UTF8ToWide once this string is localized.
442 boot_times_label_->SetText(ASCIIToWide(boot_times_text)); 442 boot_times_label_->SetText(ASCIIToWide(boot_times_text));
443 } 443 }
444 444
445 } // namespace chromeos 445 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/auth_attempt_state.cc ('k') | chrome/browser/chromeos/login/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698