Chromium Code Reviews

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 2754383004: Rename WebsiteSettings code to PageInfo. (Closed)
Patch Set: Upload missing comment fix for WebSettingsUI -> PageInfoUI. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 62 matching lines...)
73 #include "chrome/browser/ui/views/frame/top_container_view.h" 73 #include "chrome/browser/ui/views/frame/top_container_view.h"
74 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" 74 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
75 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h" 75 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h"
76 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" 76 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
77 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 77 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
78 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 78 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
79 #include "chrome/browser/ui/views/location_bar/star_view.h" 79 #include "chrome/browser/ui/views/location_bar/star_view.h"
80 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" 80 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
81 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h" 81 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h"
82 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" 82 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
83 #include "chrome/browser/ui/views/page_info/website_settings_popup_view.h" 83 #include "chrome/browser/ui/views/page_info/page_info_popup_view.h"
84 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h" 84 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
85 #include "chrome/browser/ui/views/status_bubble_views.h" 85 #include "chrome/browser/ui/views/status_bubble_views.h"
86 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" 86 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
87 #include "chrome/browser/ui/views/tabs/tab.h" 87 #include "chrome/browser/ui/views/tabs/tab.h"
88 #include "chrome/browser/ui/views/tabs/tab_strip.h" 88 #include "chrome/browser/ui/views/tabs/tab_strip.h"
89 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" 89 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
90 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 90 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
91 #include "chrome/browser/ui/views/toolbar/reload_button.h" 91 #include "chrome/browser/ui/views/toolbar/reload_button.h"
92 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 92 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
93 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" 93 #include "chrome/browser/ui/views/translate/translate_bubble_view.h"
(...skipping 1184 matching lines...)
1278 bool app_modal, 1278 bool app_modal,
1279 const base::Callback<void(bool)>& callback) { 1279 const base::Callback<void(bool)>& callback) {
1280 DownloadInProgressDialogView::Show( 1280 DownloadInProgressDialogView::Show(
1281 GetNativeWindow(), download_count, dialog_type, app_modal, callback); 1281 GetNativeWindow(), download_count, dialog_type, app_modal, callback);
1282 } 1282 }
1283 1283
1284 void BrowserView::UserChangedTheme() { 1284 void BrowserView::UserChangedTheme() {
1285 frame_->FrameTypeChanged(); 1285 frame_->FrameTypeChanged();
1286 } 1286 }
1287 1287
1288 void BrowserView::ShowWebsiteSettings( 1288 void BrowserView::ShowPageInfo(
1289 Profile* profile, 1289 Profile* profile,
1290 content::WebContents* web_contents, 1290 content::WebContents* web_contents,
1291 const GURL& virtual_url, 1291 const GURL& virtual_url,
1292 const security_state::SecurityInfo& security_info) { 1292 const security_state::SecurityInfo& security_info) {
1293 WebsiteSettingsPopupView::ShowPopup( 1293 PageInfoPopupView::ShowPopup(
1294 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile, 1294 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile,
1295 web_contents, virtual_url, security_info); 1295 web_contents, virtual_url, security_info);
1296 } 1296 }
1297 1297
1298 void BrowserView::ShowAppMenu() { 1298 void BrowserView::ShowAppMenu() {
1299 if (!toolbar_->app_menu_button()) 1299 if (!toolbar_->app_menu_button())
1300 return; 1300 return;
1301 1301
1302 // Keep the top-of-window views revealed as long as the app menu is visible. 1302 // Keep the top-of-window views revealed as long as the app menu is visible.
1303 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( 1303 std::unique_ptr<ImmersiveRevealedLock> revealed_lock(
(...skipping 1372 matching lines...)
2676 } 2676 }
2677 2677
2678 extensions::ActiveTabPermissionGranter* 2678 extensions::ActiveTabPermissionGranter*
2679 BrowserView::GetActiveTabPermissionGranter() { 2679 BrowserView::GetActiveTabPermissionGranter() {
2680 content::WebContents* web_contents = GetActiveWebContents(); 2680 content::WebContents* web_contents = GetActiveWebContents();
2681 if (!web_contents) 2681 if (!web_contents)
2682 return nullptr; 2682 return nullptr;
2683 return extensions::TabHelper::FromWebContents(web_contents) 2683 return extensions::TabHelper::FromWebContents(web_contents)
2684 ->active_tab_permission_granter(); 2684 ->active_tab_permission_granter();
2685 } 2685 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine