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

Side by Side Diff: chrome/browser/ui/views/website_settings/permission_selector_view.cc

Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/views/website_settings/permission_selector_view.h" 5 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/macros.h"
8 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/ui/website_settings/permission_menu_model.h" 10 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
10 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 11 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
11 #include "chrome/grit/generated_resources.h" 12 #include "chrome/grit/generated_resources.h"
12 #include "ui/accessibility/ax_view_state.h" 13 #include "ui/accessibility/ax_view_state.h"
13 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
14 #include "ui/gfx/image/image.h" 15 #include "ui/gfx/image/image.h"
15 #include "ui/views/controls/button/menu_button.h" 16 #include "ui/views/controls/button/menu_button.h"
16 #include "ui/views/controls/image_view.h" 17 #include "ui/views/controls/image_view.h"
17 #include "ui/views/controls/label.h" 18 #include "ui/views/controls/label.h"
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // Update the menu button text to reflect the new setting. 216 // Update the menu button text to reflect the new setting.
216 menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString( 217 menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(
217 permission.type, permission.setting, permission.default_setting, 218 permission.type, permission.setting, permission.default_setting,
218 content_settings::SETTING_SOURCE_USER)); 219 content_settings::SETTING_SOURCE_USER));
219 menu_button_->SizeToPreferredSize(); 220 menu_button_->SizeToPreferredSize();
220 221
221 FOR_EACH_OBSERVER(PermissionSelectorViewObserver, 222 FOR_EACH_OBSERVER(PermissionSelectorViewObserver,
222 observer_list_, 223 observer_list_,
223 OnPermissionChanged(permission)); 224 OnPermissionChanged(permission));
224 } 225 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698