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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 1686903002: [Abandoned] Rename PermissionBubbleManager to PermissionRequestManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tests compile Created 4 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
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/first_run/first_run.h" 60 #include "chrome/browser/first_run/first_run.h"
61 #include "chrome/browser/history/top_sites_factory.h" 61 #include "chrome/browser/history/top_sites_factory.h"
62 #include "chrome/browser/infobars/infobar_service.h" 62 #include "chrome/browser/infobars/infobar_service.h"
63 #include "chrome/browser/lifetime/application_lifetime.h" 63 #include "chrome/browser/lifetime/application_lifetime.h"
64 #include "chrome/browser/lifetime/keep_alive_registry.h" 64 #include "chrome/browser/lifetime/keep_alive_registry.h"
65 #include "chrome/browser/lifetime/keep_alive_types.h" 65 #include "chrome/browser/lifetime/keep_alive_types.h"
66 #include "chrome/browser/lifetime/scoped_keep_alive.h" 66 #include "chrome/browser/lifetime/scoped_keep_alive.h"
67 #include "chrome/browser/memory/tab_manager_web_contents_data.h" 67 #include "chrome/browser/memory/tab_manager_web_contents_data.h"
68 #include "chrome/browser/notifications/notification_ui_manager.h" 68 #include "chrome/browser/notifications/notification_ui_manager.h"
69 #include "chrome/browser/pepper_broker_infobar_delegate.h" 69 #include "chrome/browser/pepper_broker_infobar_delegate.h"
70 #include "chrome/browser/permissions/permission_request_manager.h"
70 #include "chrome/browser/prefs/incognito_mode_prefs.h" 71 #include "chrome/browser/prefs/incognito_mode_prefs.h"
71 #include "chrome/browser/profiles/profile.h" 72 #include "chrome/browser/profiles/profile.h"
72 #include "chrome/browser/profiles/profile_destroyer.h" 73 #include "chrome/browser/profiles/profile_destroyer.h"
73 #include "chrome/browser/profiles/profile_metrics.h" 74 #include "chrome/browser/profiles/profile_metrics.h"
74 #include "chrome/browser/profiles/profiles_state.h" 75 #include "chrome/browser/profiles/profiles_state.h"
75 #include "chrome/browser/repost_form_warning_controller.h" 76 #include "chrome/browser/repost_form_warning_controller.h"
76 #include "chrome/browser/search/search.h" 77 #include "chrome/browser/search/search.h"
77 #include "chrome/browser/sessions/session_restore.h" 78 #include "chrome/browser/sessions/session_restore.h"
78 #include "chrome/browser/sessions/session_service.h" 79 #include "chrome/browser/sessions/session_service.h"
79 #include "chrome/browser/sessions/session_service_factory.h" 80 #include "chrome/browser/sessions/session_service_factory.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 136 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
136 #include "chrome/browser/ui/tab_dialogs.h" 137 #include "chrome/browser/ui/tab_dialogs.h"
137 #include "chrome/browser/ui/tab_helpers.h" 138 #include "chrome/browser/ui/tab_helpers.h"
138 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" 139 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
139 #include "chrome/browser/ui/tabs/tab_menu_model.h" 140 #include "chrome/browser/ui/tabs/tab_menu_model.h"
140 #include "chrome/browser/ui/tabs/tab_strip_model.h" 141 #include "chrome/browser/ui/tabs/tab_strip_model.h"
141 #include "chrome/browser/ui/tabs/tab_strip_model_utils.h" 142 #include "chrome/browser/ui/tabs/tab_strip_model_utils.h"
142 #include "chrome/browser/ui/tabs/tab_utils.h" 143 #include "chrome/browser/ui/tabs/tab_utils.h"
143 #include "chrome/browser/ui/unload_controller.h" 144 #include "chrome/browser/ui/unload_controller.h"
144 #include "chrome/browser/ui/validation_message_bubble.h" 145 #include "chrome/browser/ui/validation_message_bubble.h"
145 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
146 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 146 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
147 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 147 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
148 #include "chrome/browser/ui/window_sizer/window_sizer.h" 148 #include "chrome/browser/ui/window_sizer/window_sizer.h"
149 #include "chrome/browser/upgrade_detector.h" 149 #include "chrome/browser/upgrade_detector.h"
150 #include "chrome/common/chrome_constants.h" 150 #include "chrome/common/chrome_constants.h"
151 #include "chrome/common/chrome_switches.h" 151 #include "chrome/common/chrome_switches.h"
152 #include "chrome/common/custom_handlers/protocol_handler.h" 152 #include "chrome/common/custom_handlers/protocol_handler.h"
153 #include "chrome/common/pref_names.h" 153 #include "chrome/common/pref_names.h"
154 #include "chrome/common/profiling.h" 154 #include "chrome/common/profiling.h"
155 #include "chrome/common/search_types.h" 155 #include "chrome/common/search_types.h"
(...skipping 1712 matching lines...) Expand 10 before | Expand all | Expand 10 after
1868 return; 1868 return;
1869 } 1869 }
1870 1870
1871 // Make sure content-setting icon is turned off in case the page does 1871 // Make sure content-setting icon is turned off in case the page does
1872 // ungestured and gestured RPH calls. 1872 // ungestured and gestured RPH calls.
1873 if (window_) { 1873 if (window_) {
1874 tab_content_settings->ClearPendingProtocolHandler(); 1874 tab_content_settings->ClearPendingProtocolHandler();
1875 window_->GetLocationBar()->UpdateContentSettingsIcons(); 1875 window_->GetLocationBar()->UpdateContentSettingsIcons();
1876 } 1876 }
1877 1877
1878 PermissionBubbleManager* bubble_manager = 1878 PermissionRequestManager* permission_request_manager =
1879 PermissionBubbleManager::FromWebContents(web_contents); 1879 PermissionRequestManager::FromWebContents(web_contents);
1880 if (bubble_manager) { 1880 if (permission_request_manager) {
1881 bubble_manager->AddRequest( 1881 permission_request_manager->AddRequest(
1882 new RegisterProtocolHandlerPermissionRequest(registry, handler, 1882 new RegisterProtocolHandlerPermissionRequest(registry, handler,
1883 url, user_gesture)); 1883 url, user_gesture));
1884 } 1884 }
1885 } 1885 }
1886 1886
1887 void Browser::UnregisterProtocolHandler(WebContents* web_contents, 1887 void Browser::UnregisterProtocolHandler(WebContents* web_contents,
1888 const std::string& protocol, 1888 const std::string& protocol,
1889 const GURL& url, 1889 const GURL& url,
1890 bool user_gesture) { 1890 bool user_gesture) {
1891 // user_gesture will be used in case we decide to have confirmation bubble 1891 // user_gesture will be used in case we decide to have confirmation bubble
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
2745 if (contents && !allow_js_access) { 2745 if (contents && !allow_js_access) {
2746 contents->web_contents()->GetController().LoadURL( 2746 contents->web_contents()->GetController().LoadURL(
2747 target_url, 2747 target_url,
2748 content::Referrer(), 2748 content::Referrer(),
2749 ui::PAGE_TRANSITION_LINK, 2749 ui::PAGE_TRANSITION_LINK,
2750 std::string()); // No extra headers. 2750 std::string()); // No extra headers.
2751 } 2751 }
2752 2752
2753 return contents != NULL; 2753 return contents != NULL;
2754 } 2754 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698