summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 04:55:06 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 04:55:06 +0000
commit9db127d05d15b9103f45cba4698ce309143ac448 (patch)
tree1a9bbd00e758285c033dab74f34047b1c2d940c8 /chrome/browser/chromeos
parent2cc35ed00c3a0588a6eb68ccda7fddf467ce6a91 (diff)
downloadchromium_src-9db127d05d15b9103f45cba4698ce309143ac448.zip
chromium_src-9db127d05d15b9103f45cba4698ce309143ac448.tar.gz
chromium_src-9db127d05d15b9103f45cba4698ce309143ac448.tar.bz2
Added gallery extension id for hterm to places where we check API permissions.
BUG=chromium-os:25101 TEST=make sure hterm loaded from the gallery works fine Review URL: http://codereview.chromium.org/9207015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/web_socket_proxy_controller.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc
index f10d44d..478e3c2 100644
--- a/chrome/browser/chromeos/web_socket_proxy_controller.cc
+++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -36,7 +36,8 @@ const char* kAllowedIds[] = {
"haiffjcadagjlijoggckpgfnoeiflnem",
"gnedhmakppccajfpfiihfcdlnpgomkcf",
"fjcibdnjlbfnbfdjneajpipnlcppleek",
- "okddffdblfhhnmhodogpojmfkjmhinfp"
+ "okddffdblfhhnmhodogpojmfkjmhinfp",
+ "pnhechapfaindjhompbnflcldabbghjo" // HTerm App (SSH Client)
};
class OriginValidator {