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

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

Issue 12792013: Instant extended: Remove suggest commit on lost focus (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address pkasting review comments Created 7 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 | Annotate | Revision Log
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 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 UMA_HISTOGRAM_CUSTOM_COUNTS( 1042 UMA_HISTOGRAM_CUSTOM_COUNTS(
1043 "Tabs.Discard.ReloadCount", ++reload_count, 1, 1000, 50); 1043 "Tabs.Discard.ReloadCount", ++reload_count, 1, 1000, 50);
1044 chrome::Reload(this, CURRENT_TAB); 1044 chrome::Reload(this, CURRENT_TAB);
1045 } 1045 }
1046 1046
1047 // If we have any update pending, do it now. 1047 // If we have any update pending, do it now.
1048 if (chrome_updater_factory_.HasWeakPtrs() && old_contents) 1048 if (chrome_updater_factory_.HasWeakPtrs() && old_contents)
1049 ProcessPendingUIUpdates(); 1049 ProcessPendingUIUpdates();
1050 1050
1051 // Propagate the profile to the location bar. 1051 // Propagate the profile to the location bar.
1052 UpdateToolbar(true); 1052 UpdateToolbar(!was_replaced);
1053 1053
1054 // Propagate tab state to toolbar, tab-strip, etc. 1054 // Propagate tab state to toolbar, tab-strip, etc.
1055 UpdateSearchState(new_contents); 1055 UpdateSearchState(new_contents);
1056 1056
1057 // Update reload/stop state. 1057 // Update reload/stop state.
1058 command_controller_->LoadingStateChanged(new_contents->IsLoading(), true); 1058 command_controller_->LoadingStateChanged(new_contents->IsLoading(), true);
1059 1059
1060 // Update commands to reflect current state. 1060 // Update commands to reflect current state.
1061 command_controller_->TabStateChanged(); 1061 command_controller_->TabStateChanged();
1062 1062
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
2239 if (contents && !allow_js_access) { 2239 if (contents && !allow_js_access) {
2240 contents->web_contents()->GetController().LoadURL( 2240 contents->web_contents()->GetController().LoadURL(
2241 target_url, 2241 target_url,
2242 content::Referrer(), 2242 content::Referrer(),
2243 content::PAGE_TRANSITION_LINK, 2243 content::PAGE_TRANSITION_LINK,
2244 std::string()); // No extra headers. 2244 std::string()); // No extra headers.
2245 } 2245 }
2246 2246
2247 return contents != NULL; 2247 return contents != NULL;
2248 } 2248 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser_instant_controller.cc » ('j') | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698