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

Side by Side Diff: chrome/browser/gpu/three_d_api_observer.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 #include "chrome/browser/gpu/three_d_api_observer.h" 5 #include "chrome/browser/gpu/three_d_api_observer.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "chrome/browser/infobars/infobar_service.h" 8 #include "chrome/browser/infobars/infobar_service.h"
9 #include "chrome/browser/tab_contents/tab_util.h" 9 #include "chrome/browser/tab_contents/tab_util.h"
10 #include "chrome/grit/generated_resources.h" 10 #include "chrome/grit/generated_resources.h"
(...skipping 21 matching lines...) Expand all
32 RELOADED, 32 RELOADED,
33 CLOSED_WITHOUT_ACTION, 33 CLOSED_WITHOUT_ACTION,
34 DISMISSAL_MAX 34 DISMISSAL_MAX
35 }; 35 };
36 36
37 ThreeDAPIInfoBarDelegate(const GURL& url, content::ThreeDAPIType requester); 37 ThreeDAPIInfoBarDelegate(const GURL& url, content::ThreeDAPIType requester);
38 virtual ~ThreeDAPIInfoBarDelegate(); 38 virtual ~ThreeDAPIInfoBarDelegate();
39 39
40 // ConfirmInfoBarDelegate: 40 // ConfirmInfoBarDelegate:
41 virtual bool EqualsDelegate( 41 virtual bool EqualsDelegate(
42 infobars::InfoBarDelegate* delegate) const OVERRIDE; 42 infobars::InfoBarDelegate* delegate) const override;
43 virtual int GetIconID() const OVERRIDE; 43 virtual int GetIconID() const override;
44 virtual base::string16 GetMessageText() const OVERRIDE; 44 virtual base::string16 GetMessageText() const override;
45 virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; 45 virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
46 virtual bool Accept() OVERRIDE; 46 virtual bool Accept() override;
47 virtual bool Cancel() OVERRIDE; 47 virtual bool Cancel() override;
48 virtual base::string16 GetLinkText() const OVERRIDE; 48 virtual base::string16 GetLinkText() const override;
49 virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE; 49 virtual bool LinkClicked(WindowOpenDisposition disposition) override;
50 50
51 GURL url_; 51 GURL url_;
52 content::ThreeDAPIType requester_; 52 content::ThreeDAPIType requester_;
53 // Basically indicates whether the infobar was displayed at all, or 53 // Basically indicates whether the infobar was displayed at all, or
54 // was a temporary instance thrown away by the InfobarService. 54 // was a temporary instance thrown away by the InfobarService.
55 mutable bool message_text_queried_; 55 mutable bool message_text_queried_;
56 bool action_taken_; 56 bool action_taken_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(ThreeDAPIInfoBarDelegate); 58 DISALLOW_COPY_AND_ASSIGN(ThreeDAPIInfoBarDelegate);
59 }; 59 };
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 int render_process_id, 169 int render_process_id,
170 int render_view_id, 170 int render_view_id,
171 content::ThreeDAPIType requester) { 171 content::ThreeDAPIType requester) {
172 content::WebContents* web_contents = tab_util::GetWebContentsByID( 172 content::WebContents* web_contents = tab_util::GetWebContentsByID(
173 render_process_id, render_view_id); 173 render_process_id, render_view_id);
174 if (!web_contents) 174 if (!web_contents)
175 return; 175 return;
176 ThreeDAPIInfoBarDelegate::Create( 176 ThreeDAPIInfoBarDelegate::Create(
177 InfoBarService::FromWebContents(web_contents), url, requester); 177 InfoBarService::FromWebContents(web_contents), url, requester);
178 } 178 }
OLDNEW
« no previous file with comments | « chrome/browser/gpu/three_d_api_observer.h ('k') | chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698