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

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

Issue 302653006: Remove use of ResourceRequestInfo::GetRequestID from cert enrollment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/browser.h ('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 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 764
765 //////////////////////////////////////////////////////////////////////////////// 765 ////////////////////////////////////////////////////////////////////////////////
766 // Browser, Tab adding/showing functions: 766 // Browser, Tab adding/showing functions:
767 767
768 void Browser::WindowFullscreenStateChanged() { 768 void Browser::WindowFullscreenStateChanged() {
769 fullscreen_controller_->WindowFullscreenStateChanged(); 769 fullscreen_controller_->WindowFullscreenStateChanged();
770 command_controller_->FullscreenStateChanged(); 770 command_controller_->FullscreenStateChanged();
771 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN); 771 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
772 } 772 }
773 773
774 void Browser::VisibleSSLStateChanged(content::WebContents* web_contents) {
775 // When the current tab's SSL state changes, we need to update the URL
776 // bar to reflect the new state.
777 DCHECK(web_contents);
778 if (tab_strip_model_->GetActiveWebContents() == web_contents)
779 UpdateToolbar(false);
780 }
781
782
783 /////////////////////////////////////////////////////////////////////////////// 774 ///////////////////////////////////////////////////////////////////////////////
784 // Browser, Assorted browser commands: 775 // Browser, Assorted browser commands:
785 776
786 void Browser::ToggleFullscreenModeWithExtension(const GURL& extension_url) { 777 void Browser::ToggleFullscreenModeWithExtension(const GURL& extension_url) {
787 fullscreen_controller_-> 778 fullscreen_controller_->
788 ToggleBrowserFullscreenModeWithExtension(extension_url); 779 ToggleBrowserFullscreenModeWithExtension(extension_url);
789 } 780 }
790 781
791 bool Browser::SupportsWindowFeature(WindowFeature feature) const { 782 bool Browser::SupportsWindowFeature(WindowFeature feature) const {
792 return SupportsWindowFeatureImpl(feature, true); 783 return SupportsWindowFeatureImpl(feature, true);
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
1329 1320
1330 // We can synchronously update commands since they will only change once per 1321 // We can synchronously update commands since they will only change once per
1331 // navigation, so we don't have to worry about flickering. We do, however, 1322 // navigation, so we don't have to worry about flickering. We do, however,
1332 // need to update the command state early on load to always present usable 1323 // need to update the command state early on load to always present usable
1333 // actions in the face of slow-to-commit pages. 1324 // actions in the face of slow-to-commit pages.
1334 if (changed_flags & (content::INVALIDATE_TYPE_URL | 1325 if (changed_flags & (content::INVALIDATE_TYPE_URL |
1335 content::INVALIDATE_TYPE_LOAD)) 1326 content::INVALIDATE_TYPE_LOAD))
1336 command_controller_->TabStateChanged(); 1327 command_controller_->TabStateChanged();
1337 } 1328 }
1338 1329
1330 void Browser::VisibleSSLStateChanged(const WebContents* source) {
1331 // When the current tab's SSL state changes, we need to update the URL
1332 // bar to reflect the new state.
1333 DCHECK(source);
1334 if (tab_strip_model_->GetActiveWebContents() == source)
1335 UpdateToolbar(false);
1336 }
1337
1339 void Browser::AddNewContents(WebContents* source, 1338 void Browser::AddNewContents(WebContents* source,
1340 WebContents* new_contents, 1339 WebContents* new_contents,
1341 WindowOpenDisposition disposition, 1340 WindowOpenDisposition disposition,
1342 const gfx::Rect& initial_pos, 1341 const gfx::Rect& initial_pos,
1343 bool user_gesture, 1342 bool user_gesture,
1344 bool* was_blocked) { 1343 bool* was_blocked) {
1345 chrome::AddWebContents(this, source, new_contents, disposition, initial_pos, 1344 chrome::AddWebContents(this, source, new_contents, disposition, initial_pos,
1346 user_gesture, was_blocked); 1345 user_gesture, was_blocked);
1347 } 1346 }
1348 1347
(...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after
2420 if (contents && !allow_js_access) { 2419 if (contents && !allow_js_access) {
2421 contents->web_contents()->GetController().LoadURL( 2420 contents->web_contents()->GetController().LoadURL(
2422 target_url, 2421 target_url,
2423 content::Referrer(), 2422 content::Referrer(),
2424 content::PAGE_TRANSITION_LINK, 2423 content::PAGE_TRANSITION_LINK,
2425 std::string()); // No extra headers. 2424 std::string()); // No extra headers.
2426 } 2425 }
2427 2426
2428 return contents != NULL; 2427 return contents != NULL;
2429 } 2428 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698