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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/chromeos/login/signin/merge_session_load_page.cc

Issue 880313002: webui: add [lang] attribute to <html> element on all webui pages so (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cros Created 5 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
« no previous file with comments | « chrome/browser/chromeos/extensions/wallpaper_private_api.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/signin/merge_session_load_page.h" 5 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "base/i18n/rtl.h"
11 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
12 #include "base/strings/string_piece.h" 11 #include "base/strings/string_piece.h"
13 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
14 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
15 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" 17 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
18 #include "chrome/browser/extensions/extension_service.h" 18 #include "chrome/browser/extensions/extension_service.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/renderer_preferences_util.h" 20 #include "chrome/browser/renderer_preferences_util.h"
21 #include "chrome/browser/tab_contents/tab_util.h" 21 #include "chrome/browser/tab_contents/tab_util.h"
22 #include "chrome/common/extensions/extension_constants.h" 22 #include "chrome/common/extensions/extension_constants.h"
23 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
24 #include "chrome/grit/browser_resources.h" 24 #include "chrome/grit/browser_resources.h"
25 #include "chrome/grit/generated_resources.h" 25 #include "chrome/grit/generated_resources.h"
26 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
27 #include "content/public/browser/interstitial_page.h" 27 #include "content/public/browser/interstitial_page.h"
28 #include "content/public/browser/notification_types.h" 28 #include "content/public/browser/notification_types.h"
29 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #include "extensions/browser/extension_system.h" 30 #include "extensions/browser/extension_system.h"
31 #include "extensions/common/extension.h" 31 #include "extensions/common/extension.h"
32 #include "extensions/common/extension_icon_set.h" 32 #include "extensions/common/extension_icon_set.h"
33 #include "net/base/escape.h" 33 #include "net/base/escape.h"
34 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 #include "ui/base/webui/jstemplate_builder.h" 36 #include "ui/base/webui/jstemplate_builder.h"
37 #include "ui/base/webui/web_ui_util.h"
37 38
38 using content::BrowserThread; 39 using content::BrowserThread;
39 using content::InterstitialPage; 40 using content::InterstitialPage;
40 using content::WebContents; 41 using content::WebContents;
41 42
42 namespace { 43 namespace {
43 44
44 // Delay time for showing interstitial page. 45 // Delay time for showing interstitial page.
45 const int kShowDelayTimeMS = 1000; 46 const int kShowDelayTimeMS = 1000;
46 47
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 base::DictionaryValue strings; 81 base::DictionaryValue strings;
81 strings.SetString("title", web_contents_->GetTitle()); 82 strings.SetString("title", web_contents_->GetTitle());
82 // Set the timeout to show the page. 83 // Set the timeout to show the page.
83 strings.SetInteger("show_delay_time", kShowDelayTimeMS); 84 strings.SetInteger("show_delay_time", kShowDelayTimeMS);
84 strings.SetInteger("total_wait_time", kTotalWaitTimeMS); 85 strings.SetInteger("total_wait_time", kTotalWaitTimeMS);
85 // TODO(zelidrag): Flip the message to IDS_MERGE_SESSION_LOAD_HEADLINE 86 // TODO(zelidrag): Flip the message to IDS_MERGE_SESSION_LOAD_HEADLINE
86 // after merge. 87 // after merge.
87 strings.SetString("heading", 88 strings.SetString("heading",
88 l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE)); 89 l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE));
89 90
90 bool rtl = base::i18n::IsRTL(); 91 const std::string& app_locale = g_browser_process->GetApplicationLocale();
91 strings.SetString("textdirection", rtl ? "rtl" : "ltr"); 92 webui::SetLoadTimeDataDefaults(app_locale, &strings);
92 93
93 base::StringPiece html( 94 base::StringPiece html(
94 ResourceBundle::GetSharedInstance().GetRawDataResource( 95 ResourceBundle::GetSharedInstance().GetRawDataResource(
95 IDR_MERGE_SESSION_LOAD_HTML)); 96 IDR_MERGE_SESSION_LOAD_HTML));
96 return webui::GetI18nTemplateHtml(html, &strings); 97 return webui::GetI18nTemplateHtml(html, &strings);
97 } 98 }
98 99
99 void MergeSessionLoadPage::OverrideRendererPrefs( 100 void MergeSessionLoadPage::OverrideRendererPrefs(
100 content::RendererPreferences* prefs) { 101 content::RendererPreferences* prefs) {
101 Profile* profile = Profile::FromBrowserContext( 102 Profile* profile = Profile::FromBrowserContext(
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 " NOT " : "") 165 " NOT " : "")
165 << " be blocking now, " 166 << " be blocking now, "
166 << state; 167 << state;
167 if (!manager->ShouldBlockTabLoading()) { 168 if (!manager->ShouldBlockTabLoading()) {
168 manager->RemoveObserver(this); 169 manager->RemoveObserver(this);
169 interstitial_page_->Proceed(); 170 interstitial_page_->Proceed();
170 } 171 }
171 } 172 }
172 173
173 } // namespace chromeos 174 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/wallpaper_private_api.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698