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

Side by Side Diff: chrome/browser/dom_ui/options/about_page_handler.cc

Issue 4565001: Add Canary to the channel switching UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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/dom_ui/options/about_page_handler.h" 5 #include "chrome/browser/dom_ui/options/about_page_handler.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 { "product", IDS_PRODUCT_NAME }, 73 { "product", IDS_PRODUCT_NAME },
74 { "check_now", IDS_ABOUT_CHROME_UPDATE_CHECK }, 74 { "check_now", IDS_ABOUT_CHROME_UPDATE_CHECK },
75 #endif 75 #endif
76 { "browser", IDS_PRODUCT_NAME }, 76 { "browser", IDS_PRODUCT_NAME },
77 { "more_info", IDS_ABOUT_PAGE_MORE_INFO }, 77 { "more_info", IDS_ABOUT_PAGE_MORE_INFO },
78 { "copyright", IDS_ABOUT_VERSION_COPYRIGHT }, 78 { "copyright", IDS_ABOUT_VERSION_COPYRIGHT },
79 { "channel", IDS_ABOUT_PAGE_CHANNEL }, 79 { "channel", IDS_ABOUT_PAGE_CHANNEL },
80 { "release", IDS_ABOUT_PAGE_CHANNEL_RELEASE }, 80 { "release", IDS_ABOUT_PAGE_CHANNEL_RELEASE },
81 { "beta", IDS_ABOUT_PAGE_CHANNEL_BETA }, 81 { "beta", IDS_ABOUT_PAGE_CHANNEL_BETA },
82 { "development", IDS_ABOUT_PAGE_CHANNEL_DEVELOPMENT }, 82 { "development", IDS_ABOUT_PAGE_CHANNEL_DEVELOPMENT },
83 { "canary", IDS_ABOUT_PAGE_CHANNEL_CANARY },
83 { "user_agent", IDS_ABOUT_VERSION_USER_AGENT }, 84 { "user_agent", IDS_ABOUT_VERSION_USER_AGENT },
84 { "command_line", IDS_ABOUT_VERSION_COMMAND_LINE }, 85 { "command_line", IDS_ABOUT_VERSION_COMMAND_LINE },
85 { "aboutPage", IDS_ABOUT_PAGE_TITLE } 86 { "aboutPage", IDS_ABOUT_PAGE_TITLE }
86 }; 87 };
87 88
88 void LocalizedStrings(DictionaryValue* localized_strings) { 89 void LocalizedStrings(DictionaryValue* localized_strings) {
89 for (size_t n = 0; n != arraysize(localize_table); ++n) { 90 for (size_t n = 0; n != arraysize(localize_table); ++n) {
90 localized_strings->SetString(localize_table[n].identifier, 91 localized_strings->SetString(localize_table[n].identifier,
91 l10n_util::GetStringUTF16(localize_table[n].resource)); 92 l10n_util::GetStringUTF16(localize_table[n].resource));
92 } 93 }
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 381
381 void AboutPageHandler::OnOSVersion(chromeos::VersionLoader::Handle handle, 382 void AboutPageHandler::OnOSVersion(chromeos::VersionLoader::Handle handle,
382 std::string version) { 383 std::string version) {
383 if (version.size()) { 384 if (version.size()) {
384 scoped_ptr<Value> version_string(Value::CreateStringValue(version)); 385 scoped_ptr<Value> version_string(Value::CreateStringValue(version));
385 dom_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback", 386 dom_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback",
386 *version_string); 387 *version_string);
387 } 388 }
388 } 389 }
389 #endif 390 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698