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

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

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/browser.h ('k') | chrome/browser/ui/browser_browsertest.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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 //////////////////////////////////////////////////////////////////////////////// 304 ////////////////////////////////////////////////////////////////////////////////
305 // Browser, InterstitialObserver: 305 // Browser, InterstitialObserver:
306 306
307 class Browser::InterstitialObserver : public content::WebContentsObserver { 307 class Browser::InterstitialObserver : public content::WebContentsObserver {
308 public: 308 public:
309 InterstitialObserver(Browser* browser, content::WebContents* web_contents) 309 InterstitialObserver(Browser* browser, content::WebContents* web_contents)
310 : WebContentsObserver(web_contents), 310 : WebContentsObserver(web_contents),
311 browser_(browser) { 311 browser_(browser) {
312 } 312 }
313 313
314 virtual void DidAttachInterstitialPage() OVERRIDE { 314 virtual void DidAttachInterstitialPage() override {
315 browser_->UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); 315 browser_->UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
316 } 316 }
317 317
318 virtual void DidDetachInterstitialPage() OVERRIDE { 318 virtual void DidDetachInterstitialPage() override {
319 browser_->UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); 319 browser_->UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
320 } 320 }
321 321
322 private: 322 private:
323 Browser* browser_; 323 Browser* browser_;
324 324
325 DISALLOW_COPY_AND_ASSIGN(InterstitialObserver); 325 DISALLOW_COPY_AND_ASSIGN(InterstitialObserver);
326 }; 326 };
327 327
328 /////////////////////////////////////////////////////////////////////////////// 328 ///////////////////////////////////////////////////////////////////////////////
(...skipping 2163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2492 if (contents && !allow_js_access) { 2492 if (contents && !allow_js_access) {
2493 contents->web_contents()->GetController().LoadURL( 2493 contents->web_contents()->GetController().LoadURL(
2494 target_url, 2494 target_url,
2495 content::Referrer(), 2495 content::Referrer(),
2496 ui::PAGE_TRANSITION_LINK, 2496 ui::PAGE_TRANSITION_LINK,
2497 std::string()); // No extra headers. 2497 std::string()); // No extra headers.
2498 } 2498 }
2499 2499
2500 return contents != NULL; 2500 return contents != NULL;
2501 } 2501 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698