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

Side by Side Diff: chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc

Issue 5329007: UI polish changes on cellular plan activation page.... (Closed) Base URL: svn://svn.chromium.org/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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/mobile_setup.html » ('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 (c) 2006-2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-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/dom_ui/mobile_setup_ui.h" 5 #include "chrome/browser/chromeos/dom_ui/mobile_setup_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 strings.SetString("title", l10n_util::GetStringUTF16(IDS_MOBILE_SETUP_TITLE)); 353 strings.SetString("title", l10n_util::GetStringUTF16(IDS_MOBILE_SETUP_TITLE));
354 strings.SetString("connecting_header", 354 strings.SetString("connecting_header",
355 l10n_util::GetStringFUTF16(IDS_MOBILE_CONNECTING_HEADER, 355 l10n_util::GetStringFUTF16(IDS_MOBILE_CONNECTING_HEADER,
356 network ? UTF8ToUTF16(network->name()) : string16())); 356 network ? UTF8ToUTF16(network->name()) : string16()));
357 strings.SetString("error_header", 357 strings.SetString("error_header",
358 l10n_util::GetStringUTF16(IDS_MOBILE_ERROR_HEADER)); 358 l10n_util::GetStringUTF16(IDS_MOBILE_ERROR_HEADER));
359 strings.SetString("activating_header", 359 strings.SetString("activating_header",
360 l10n_util::GetStringUTF16(IDS_MOBILE_ACTIVATING_HEADER)); 360 l10n_util::GetStringUTF16(IDS_MOBILE_ACTIVATING_HEADER));
361 strings.SetString("completed_header", 361 strings.SetString("completed_header",
362 l10n_util::GetStringUTF16(IDS_MOBILE_COMPLETED_HEADER)); 362 l10n_util::GetStringUTF16(IDS_MOBILE_COMPLETED_HEADER));
363 strings.SetString("please_wait",
364 l10n_util::GetStringUTF16(IDS_MOBILE_PLEASE_WAIT));
363 strings.SetString("completed_text", 365 strings.SetString("completed_text",
364 l10n_util::GetStringUTF16(IDS_MOBILE_COMPLETED_TEXT)); 366 l10n_util::GetStringUTF16(IDS_MOBILE_COMPLETED_TEXT));
365 strings.SetString("close_button", 367 strings.SetString("close_button",
366 l10n_util::GetStringUTF16(IDS_CLOSE)); 368 l10n_util::GetStringUTF16(IDS_CLOSE));
367 SetFontAndTextDirection(&strings); 369 SetFontAndTextDirection(&strings);
368 370
369 static const base::StringPiece html( 371 static const base::StringPiece html(
370 ResourceBundle::GetSharedInstance().GetRawDataResource( 372 ResourceBundle::GetSharedInstance().GetRawDataResource(
371 IDR_MOBILE_SETUP_PAGE_HTML)); 373 IDR_MOBILE_SETUP_PAGE_HTML));
372 const std::string full_html = jstemplate_builder::GetTemplatesHtml( 374 const std::string full_html = jstemplate_builder::GetTemplatesHtml(
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 new MobileSetupUIHTMLSource(service_path); 1033 new MobileSetupUIHTMLSource(service_path);
1032 1034
1033 // Set up the chrome://mobilesetup/ source. 1035 // Set up the chrome://mobilesetup/ source.
1034 BrowserThread::PostTask( 1036 BrowserThread::PostTask(
1035 BrowserThread::IO, FROM_HERE, 1037 BrowserThread::IO, FROM_HERE,
1036 NewRunnableMethod( 1038 NewRunnableMethod(
1037 Singleton<ChromeURLDataManager>::get(), 1039 Singleton<ChromeURLDataManager>::get(),
1038 &ChromeURLDataManager::AddDataSource, 1040 &ChromeURLDataManager::AddDataSource,
1039 make_scoped_refptr(html_source))); 1041 make_scoped_refptr(html_source)));
1040 } 1042 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/mobile_setup.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698