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

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

Issue 2748443005: Rename website_settings UI folders to permission_bubble. (Closed)
Patch Set: Rebase. 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 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h" 116 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h"
117 #include "chrome/browser/ui/fast_unload_controller.h" 117 #include "chrome/browser/ui/fast_unload_controller.h"
118 #include "chrome/browser/ui/find_bar/find_bar.h" 118 #include "chrome/browser/ui/find_bar/find_bar.h"
119 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 119 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
120 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 120 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
121 #include "chrome/browser/ui/global_error/global_error.h" 121 #include "chrome/browser/ui/global_error/global_error.h"
122 #include "chrome/browser/ui/global_error/global_error_service.h" 122 #include "chrome/browser/ui/global_error/global_error_service.h"
123 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 123 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
124 #include "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h" 124 #include "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h"
125 #include "chrome/browser/ui/location_bar/location_bar.h" 125 #include "chrome/browser/ui/location_bar/location_bar.h"
126 #include "chrome/browser/ui/permission_bubble/chooser_bubble_delegate.h"
126 #include "chrome/browser/ui/search/search_delegate.h" 127 #include "chrome/browser/ui/search/search_delegate.h"
127 #include "chrome/browser/ui/search/search_model.h" 128 #include "chrome/browser/ui/search/search_model.h"
128 #include "chrome/browser/ui/search/search_tab_helper.h" 129 #include "chrome/browser/ui/search/search_tab_helper.h"
129 #include "chrome/browser/ui/settings_window_manager.h" 130 #include "chrome/browser/ui/settings_window_manager.h"
130 #include "chrome/browser/ui/singleton_tabs.h" 131 #include "chrome/browser/ui/singleton_tabs.h"
131 #include "chrome/browser/ui/status_bubble.h" 132 #include "chrome/browser/ui/status_bubble.h"
132 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h" 133 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h"
133 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 134 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
134 #include "chrome/browser/ui/tab_dialogs.h" 135 #include "chrome/browser/ui/tab_dialogs.h"
135 #include "chrome/browser/ui/tab_helpers.h" 136 #include "chrome/browser/ui/tab_helpers.h"
136 #include "chrome/browser/ui/tab_modal_confirm_dialog.h" 137 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
137 #include "chrome/browser/ui/tabs/tab_menu_model.h" 138 #include "chrome/browser/ui/tabs/tab_menu_model.h"
138 #include "chrome/browser/ui/tabs/tab_strip_model.h" 139 #include "chrome/browser/ui/tabs/tab_strip_model.h"
139 #include "chrome/browser/ui/tabs/tab_utils.h" 140 #include "chrome/browser/ui/tabs/tab_utils.h"
140 #include "chrome/browser/ui/unload_controller.h" 141 #include "chrome/browser/ui/unload_controller.h"
141 #include "chrome/browser/ui/validation_message_bubble.h" 142 #include "chrome/browser/ui/validation_message_bubble.h"
142 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"
143 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 143 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
144 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 144 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
145 #include "chrome/browser/ui/window_sizer/window_sizer.h" 145 #include "chrome/browser/ui/window_sizer/window_sizer.h"
146 #include "chrome/browser/upgrade_detector.h" 146 #include "chrome/browser/upgrade_detector.h"
147 #include "chrome/common/chrome_constants.h" 147 #include "chrome/common/chrome_constants.h"
148 #include "chrome/common/chrome_switches.h" 148 #include "chrome/common/chrome_switches.h"
149 #include "chrome/common/custom_handlers/protocol_handler.h" 149 #include "chrome/common/custom_handlers/protocol_handler.h"
150 #include "chrome/common/pref_names.h" 150 #include "chrome/common/pref_names.h"
151 #include "chrome/common/profiling.h" 151 #include "chrome/common/profiling.h"
152 #include "chrome/common/ssl_insecure_content.h" 152 #include "chrome/common/ssl_insecure_content.h"
(...skipping 2501 matching lines...) Expand 10 before | Expand all | Expand 10 after
2654 // new window later, thus we need to navigate the window now. 2654 // new window later, thus we need to navigate the window now.
2655 if (contents) { 2655 if (contents) {
2656 contents->web_contents()->GetController().LoadURL( 2656 contents->web_contents()->GetController().LoadURL(
2657 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK, 2657 target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK,
2658 std::string()); // No extra headers. 2658 std::string()); // No extra headers.
2659 } 2659 }
2660 } 2660 }
2661 2661
2662 return contents != NULL; 2662 return contents != NULL;
2663 } 2663 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698