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

Side by Side Diff: chrome/browser/ui/views/permission_bubble/permission_selector_row.cc

Issue 2748443005: Rename website_settings UI folders to permission_bubble. (Closed)
Patch Set: Created 3 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) 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_row.h" 5 #include "chrome/browser/ui/views/permission_bubble/permission_selector_row.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/ui/page_info/website_settings_ui.h" 10 #include "chrome/browser/ui/page_info/website_settings_ui.h"
11 #include "chrome/browser/ui/permission_bubble/permission_menu_model.h"
11 #include "chrome/browser/ui/views/page_info/non_accessible_image_view.h" 12 #include "chrome/browser/ui/views/page_info/non_accessible_image_view.h"
12 #include "chrome/browser/ui/views/page_info/website_settings_popup_view.h" 13 #include "chrome/browser/ui/views/page_info/website_settings_popup_view.h"
13 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
14 #include "chrome/grit/generated_resources.h" 14 #include "chrome/grit/generated_resources.h"
15 #include "ui/accessibility/ax_node_data.h" 15 #include "ui/accessibility/ax_node_data.h"
16 #include "ui/base/material_design/material_design_controller.h" 16 #include "ui/base/material_design/material_design_controller.h"
17 #include "ui/base/models/combobox_model.h" 17 #include "ui/base/models/combobox_model.h"
18 #include "ui/gfx/image/image.h" 18 #include "ui/gfx/image/image.h"
19 #include "ui/views/controls/button/menu_button.h" 19 #include "ui/views/controls/button/menu_button.h"
20 #include "ui/views/controls/combobox/combobox.h" 20 #include "ui/views/controls/combobox/combobox.h"
21 #include "ui/views/controls/combobox/combobox_listener.h" 21 #include "ui/views/controls/combobox/combobox_listener.h"
22 #include "ui/views/controls/image_view.h" 22 #include "ui/views/controls/image_view.h"
23 #include "ui/views/controls/label.h" 23 #include "ui/views/controls/label.h"
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 permission.default_setting, content_settings::SETTING_SOURCE_USER)); 353 permission.default_setting, content_settings::SETTING_SOURCE_USER));
354 menu_button_->SizeToPreferredSize(); 354 menu_button_->SizeToPreferredSize();
355 } else if (combobox_) { 355 } else if (combobox_) {
356 bool use_default = permission.setting == CONTENT_SETTING_DEFAULT; 356 bool use_default = permission.setting == CONTENT_SETTING_DEFAULT;
357 combobox_->UpdateSelectedIndex(use_default); 357 combobox_->UpdateSelectedIndex(use_default);
358 } 358 }
359 359
360 for (PermissionSelectorRowObserver& observer : observer_list_) 360 for (PermissionSelectorRowObserver& observer : observer_list_)
361 observer.OnPermissionChanged(permission); 361 observer.OnPermissionChanged(permission);
362 } 362 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698