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

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

Issue 2797923003: Rename PageInfoPopupView to PageInfoBubbleView. (Closed)
Patch Set: Two more words. Created 3 years, 8 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 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "chrome/browser/ui/views/frame/top_container_view.h" 74 #include "chrome/browser/ui/views/frame/top_container_view.h"
75 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" 75 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
76 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h" 76 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h"
77 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" 77 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
78 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 78 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
79 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 79 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
80 #include "chrome/browser/ui/views/location_bar/star_view.h" 80 #include "chrome/browser/ui/views/location_bar/star_view.h"
81 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" 81 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
82 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h" 82 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h"
83 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" 83 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
84 #include "chrome/browser/ui/views/page_info/page_info_popup_view.h" 84 #include "chrome/browser/ui/views/page_info/page_info_bubble_view.h"
85 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h" 85 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
86 #include "chrome/browser/ui/views/status_bubble_views.h" 86 #include "chrome/browser/ui/views/status_bubble_views.h"
87 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" 87 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
88 #include "chrome/browser/ui/views/tabs/tab.h" 88 #include "chrome/browser/ui/views/tabs/tab.h"
89 #include "chrome/browser/ui/views/tabs/tab_strip.h" 89 #include "chrome/browser/ui/views/tabs/tab_strip.h"
90 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" 90 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
91 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 91 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
92 #include "chrome/browser/ui/views/toolbar/reload_button.h" 92 #include "chrome/browser/ui/views/toolbar/reload_button.h"
93 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 93 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
94 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" 94 #include "chrome/browser/ui/views/translate/translate_bubble_view.h"
(...skipping 1189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1284 1284
1285 void BrowserView::UserChangedTheme() { 1285 void BrowserView::UserChangedTheme() {
1286 frame_->FrameTypeChanged(); 1286 frame_->FrameTypeChanged();
1287 } 1287 }
1288 1288
1289 void BrowserView::ShowPageInfo( 1289 void BrowserView::ShowPageInfo(
1290 Profile* profile, 1290 Profile* profile,
1291 content::WebContents* web_contents, 1291 content::WebContents* web_contents,
1292 const GURL& virtual_url, 1292 const GURL& virtual_url,
1293 const security_state::SecurityInfo& security_info) { 1293 const security_state::SecurityInfo& security_info) {
1294 PageInfoPopupView::ShowPopup( 1294 PageInfoBubbleView::ShowBubble(
1295 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile, 1295 GetLocationBarView()->GetSecurityBubbleAnchorView(), gfx::Rect(), profile,
1296 web_contents, virtual_url, security_info); 1296 web_contents, virtual_url, security_info);
1297 } 1297 }
1298 1298
1299 void BrowserView::ShowAppMenu() { 1299 void BrowserView::ShowAppMenu() {
1300 if (!toolbar_->app_menu_button()) 1300 if (!toolbar_->app_menu_button())
1301 return; 1301 return;
1302 1302
1303 // Keep the top-of-window views revealed as long as the app menu is visible. 1303 // Keep the top-of-window views revealed as long as the app menu is visible.
1304 std::unique_ptr<ImmersiveRevealedLock> revealed_lock( 1304 std::unique_ptr<ImmersiveRevealedLock> revealed_lock(
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
2686 } 2686 }
2687 2687
2688 extensions::ActiveTabPermissionGranter* 2688 extensions::ActiveTabPermissionGranter*
2689 BrowserView::GetActiveTabPermissionGranter() { 2689 BrowserView::GetActiveTabPermissionGranter() {
2690 content::WebContents* web_contents = GetActiveWebContents(); 2690 content::WebContents* web_contents = GetActiveWebContents();
2691 if (!web_contents) 2691 if (!web_contents)
2692 return nullptr; 2692 return nullptr;
2693 return extensions::TabHelper::FromWebContents(web_contents) 2693 return extensions::TabHelper::FromWebContents(web_contents)
2694 ->active_tab_permission_granter(); 2694 ->active_tab_permission_granter();
2695 } 2695 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/browser_dialogs_views_mac.cc ('k') | chrome/browser/ui/views/location_bar/location_icon_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698