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

Side by Side Diff: chrome/common/chrome_content_client.h

Issue 622373003: Replacing the OVERRIDE with override in chrome/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved Error 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 | « no previous file | chrome/common/crash_keys_unittest.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 5 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "content/public/common/content_client.h" 13 #include "content/public/common/content_client.h"
14 14
15 // Returns the user agent of Chrome. 15 // Returns the user agent of Chrome.
16 std::string GetUserAgent(); 16 std::string GetUserAgent();
17 17
18 class ChromeContentClient : public content::ContentClient { 18 class ChromeContentClient : public content::ContentClient {
19 public: 19 public:
20 static const char* const kPDFPluginName; 20 static const char* const kPDFPluginName;
21 static const char* const kRemotingViewerPluginPath; 21 static const char* const kRemotingViewerPluginPath;
22 22
23 virtual void SetActiveURL(const GURL& url) OVERRIDE; 23 virtual void SetActiveURL(const GURL& url) override;
24 virtual void SetGpuInfo(const gpu::GPUInfo& gpu_info) OVERRIDE; 24 virtual void SetGpuInfo(const gpu::GPUInfo& gpu_info) override;
25 virtual void AddPepperPlugins( 25 virtual void AddPepperPlugins(
26 std::vector<content::PepperPluginInfo>* plugins) OVERRIDE; 26 std::vector<content::PepperPluginInfo>* plugins) override;
27 virtual void AddAdditionalSchemes( 27 virtual void AddAdditionalSchemes(
28 std::vector<std::string>* standard_schemes, 28 std::vector<std::string>* standard_schemes,
29 std::vector<std::string>* saveable_shemes) OVERRIDE; 29 std::vector<std::string>* saveable_shemes) override;
30 virtual std::string GetProduct() const OVERRIDE; 30 virtual std::string GetProduct() const override;
31 virtual std::string GetUserAgent() const OVERRIDE; 31 virtual std::string GetUserAgent() const override;
32 virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE; 32 virtual base::string16 GetLocalizedString(int message_id) const override;
33 virtual base::StringPiece GetDataResource( 33 virtual base::StringPiece GetDataResource(
34 int resource_id, 34 int resource_id,
35 ui::ScaleFactor scale_factor) const OVERRIDE; 35 ui::ScaleFactor scale_factor) const override;
36 virtual base::RefCountedStaticMemory* GetDataResourceBytes( 36 virtual base::RefCountedStaticMemory* GetDataResourceBytes(
37 int resource_id) const OVERRIDE; 37 int resource_id) const override;
38 virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE; 38 virtual gfx::Image& GetNativeImageNamed(int resource_id) const override;
39 virtual std::string GetProcessTypeNameInEnglish(int type) OVERRIDE; 39 virtual std::string GetProcessTypeNameInEnglish(int type) override;
40 40
41 #if defined(OS_MACOSX) && !defined(OS_IOS) 41 #if defined(OS_MACOSX) && !defined(OS_IOS)
42 virtual bool GetSandboxProfileForSandboxType( 42 virtual bool GetSandboxProfileForSandboxType(
43 int sandbox_type, 43 int sandbox_type,
44 int* sandbox_profile_resource_id) const OVERRIDE; 44 int* sandbox_profile_resource_id) const override;
45 #endif 45 #endif
46 }; 46 };
47 47
48 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_ 48 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/common/crash_keys_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698