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

Side by Side Diff: chrome/browser/views/options/exceptions_view.cc

Issue 650180: Initial Geolocation location bar icons. (Closed)
Patch Set: Addresses Peter and Brett's comments. Created 10 years, 9 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
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/views/options/exceptions_view.h" 5 #include "chrome/browser/views/options/exceptions_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 case CONTENT_SETTINGS_TYPE_COOKIES: 109 case CONTENT_SETTINGS_TYPE_COOKIES:
110 return l10n_util::GetString(IDS_COOKIE_EXCEPTION_TITLE); 110 return l10n_util::GetString(IDS_COOKIE_EXCEPTION_TITLE);
111 case CONTENT_SETTINGS_TYPE_IMAGES: 111 case CONTENT_SETTINGS_TYPE_IMAGES:
112 return l10n_util::GetString(IDS_IMAGES_EXCEPTION_TITLE); 112 return l10n_util::GetString(IDS_IMAGES_EXCEPTION_TITLE);
113 case CONTENT_SETTINGS_TYPE_JAVASCRIPT: 113 case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
114 return l10n_util::GetString(IDS_JS_EXCEPTION_TITLE); 114 return l10n_util::GetString(IDS_JS_EXCEPTION_TITLE);
115 case CONTENT_SETTINGS_TYPE_PLUGINS: 115 case CONTENT_SETTINGS_TYPE_PLUGINS:
116 return l10n_util::GetString(IDS_PLUGINS_EXCEPTION_TITLE); 116 return l10n_util::GetString(IDS_PLUGINS_EXCEPTION_TITLE);
117 case CONTENT_SETTINGS_TYPE_POPUPS: 117 case CONTENT_SETTINGS_TYPE_POPUPS:
118 return l10n_util::GetString(IDS_POPUP_EXCEPTION_TITLE); 118 return l10n_util::GetString(IDS_POPUP_EXCEPTION_TITLE);
119 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
120 return l10n_util::GetString(IDS_GEOLOCATION_EXCEPTION_TITLE);
119 default: 121 default:
120 NOTREACHED(); 122 NOTREACHED();
121 } 123 }
122 return std::wstring(); 124 return std::wstring();
123 } 125 }
124 126
125 void ExceptionsView::AcceptExceptionEdit(const std::string& host, 127 void ExceptionsView::AcceptExceptionEdit(const std::string& host,
126 ContentSetting setting, 128 ContentSetting setting,
127 int index, 129 int index,
128 bool is_new) { 130 bool is_new) {
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 } 246 }
245 247
246 UpdateButtonState(); 248 UpdateButtonState();
247 } 249 }
248 250
249 void ExceptionsView::RemoveAll() { 251 void ExceptionsView::RemoveAll() {
250 model_.RemoveAll(); 252 model_.RemoveAll();
251 253
252 UpdateButtonState(); 254 UpdateButtonState();
253 } 255 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698