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

Side by Side Diff: chrome/browser/chromeos/login/signin/merge_session_load_page.h

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 void Show(); 47 void Show();
48 48
49 protected: 49 protected:
50 virtual ~MergeSessionLoadPage(); 50 virtual ~MergeSessionLoadPage();
51 51
52 private: 52 private:
53 friend class TestMergeSessionLoadPage; 53 friend class TestMergeSessionLoadPage;
54 54
55 // InterstitialPageDelegate implementation. 55 // InterstitialPageDelegate implementation.
56 virtual std::string GetHTMLContents() OVERRIDE; 56 virtual std::string GetHTMLContents() override;
57 virtual void CommandReceived(const std::string& command) OVERRIDE; 57 virtual void CommandReceived(const std::string& command) override;
58 virtual void OverrideRendererPrefs( 58 virtual void OverrideRendererPrefs(
59 content::RendererPreferences* prefs) OVERRIDE; 59 content::RendererPreferences* prefs) override;
60 virtual void OnProceed() OVERRIDE; 60 virtual void OnProceed() override;
61 virtual void OnDontProceed() OVERRIDE; 61 virtual void OnDontProceed() override;
62 62
63 // OAuth2LoginManager::Observer overrides. 63 // OAuth2LoginManager::Observer overrides.
64 virtual void OnSessionRestoreStateChanged( 64 virtual void OnSessionRestoreStateChanged(
65 Profile* user_profile, 65 Profile* user_profile,
66 OAuth2LoginManager::SessionRestoreState state) OVERRIDE; 66 OAuth2LoginManager::SessionRestoreState state) override;
67 67
68 void NotifyBlockingPageComplete(); 68 void NotifyBlockingPageComplete();
69 69
70 // Helper function to get OAuth2LoginManager out of |web_contents_|. 70 // Helper function to get OAuth2LoginManager out of |web_contents_|.
71 OAuth2LoginManager* GetOAuth2LoginManager(); 71 OAuth2LoginManager* GetOAuth2LoginManager();
72 72
73 MergeSessionThrottle::CompletionCallback callback_; 73 MergeSessionThrottle::CompletionCallback callback_;
74 74
75 // True if the proceed is chosen. 75 // True if the proceed is chosen.
76 bool proceeded_; 76 bool proceeded_;
77 77
78 content::WebContents* web_contents_; 78 content::WebContents* web_contents_;
79 GURL url_; 79 GURL url_;
80 content::InterstitialPage* interstitial_page_; // Owns us. 80 content::InterstitialPage* interstitial_page_; // Owns us.
81 81
82 DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPage); 82 DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPage);
83 }; 83 };
84 84
85 } // namespace chromeos 85 } // namespace chromeos
86 86
87 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_ 87 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_LOAD_PAGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698