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

Side by Side Diff: chrome/browser/ui/webui/help/help_handler.cc

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 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
OLDNEW
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/ui/webui/help/help_handler.h" 5 #include "chrome/browser/ui/webui/help/help_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 18 matching lines...) Expand all
29 #include "grit/chromium_strings.h" 29 #include "grit/chromium_strings.h"
30 #include "grit/generated_resources.h" 30 #include "grit/generated_resources.h"
31 #include "grit/google_chrome_strings.h" 31 #include "grit/google_chrome_strings.h"
32 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
34 #include "v8/include/v8.h" 34 #include "v8/include/v8.h"
35 #include "webkit/glue/user_agent.h" 35 #include "webkit/glue/user_agent.h"
36 #include "webkit/glue/webkit_glue.h" 36 #include "webkit/glue/webkit_glue.h"
37 37
38 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
39 #include "base/file_util_proxy.h"
39 #include "base/i18n/time_formatting.h" 40 #include "base/i18n/time_formatting.h"
40 #include "base/file_util_proxy.h"
41 #include "base/sys_info.h" 41 #include "base/sys_info.h"
42 #include "chrome/browser/chromeos/login/user_manager.h" 42 #include "chrome/browser/chromeos/login/user_manager.h"
43 #include "chrome/browser/chromeos/cros_settings.h" 43 #include "chrome/browser/chromeos/settings/cros_settings.h"
44 #include "chrome/browser/prefs/pref_service.h"
44 #include "chrome/browser/profiles/profile.h" 45 #include "chrome/browser/profiles/profile.h"
45 #include "chrome/browser/prefs/pref_service.h"
46 #include "content/public/browser/browser_thread.h" 46 #include "content/public/browser/browser_thread.h"
47 #endif 47 #endif
48 48
49 #if defined(OS_MACOSX) 49 #if defined(OS_MACOSX)
50 #include "chrome/browser/ui/cocoa/obsolete_os.h" 50 #include "chrome/browser/ui/cocoa/obsolete_os.h"
51 #endif 51 #endif
52 52
53 using base::ListValue; 53 using base::ListValue;
54 using content::BrowserThread; 54 using content::BrowserThread;
55 55
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 451
452 // Note that this string will be internationalized. 452 // Note that this string will be internationalized.
453 string16 last_updated = base::TimeFormatFriendlyDate(time); 453 string16 last_updated = base::TimeFormatFriendlyDate(time);
454 g_last_updated_string = Value::CreateStringValue(last_updated); 454 g_last_updated_string = Value::CreateStringValue(last_updated);
455 } 455 }
456 456
457 web_ui()->CallJavascriptFunction("help.HelpPage.setLastUpdated", 457 web_ui()->CallJavascriptFunction("help.HelpPage.setLastUpdated",
458 *g_last_updated_string); 458 *g_last_updated_string);
459 } 459 }
460 #endif // defined(OS_CHROMEOS) 460 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/flags_ui.cc ('k') | chrome/browser/ui/webui/help/version_updater_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698