extensions/shell/browser/shell_browser_main_parts.h - Issue 1547793004: Make gpu black list work again on Linux

Side by Side Diff: extensions/shell/browser/shell_browser_main_parts.h

Issue 1547793004: Make gpu black list work again on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add a new commandline switch to prevent full gpu info collection in the test Created 4 years, 10 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

« content/browser/devtools/protocol/system_info_handler.cc ('K') | « content/test/gpu/page_sets/gpu_process_tests.py ('k') | extensions/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_	5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_

6 #define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_	6 #define EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_

7	7

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "base/macros.h"	9 #include "base/macros.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 ~ShellBrowserMainParts() override;	55 ~ShellBrowserMainParts() override;

56	56

57 ShellBrowserContext* browser_context() { return browser_context_.get(); }	57 ShellBrowserContext* browser_context() { return browser_context_.get(); }

58	58

59 ShellExtensionSystem* extension_system() { return extension_system_; }	59 ShellExtensionSystem* extension_system() { return extension_system_; }

60	60

61 // BrowserMainParts overrides.	61 // BrowserMainParts overrides.

62 void PreEarlyInitialization() override;	62 void PreEarlyInitialization() override;

63 void PreMainMessageLoopStart() override;	63 void PreMainMessageLoopStart() override;

64 void PostMainMessageLoopStart() override;	64 void PostMainMessageLoopStart() override;

65 int PreCreateThreads() override;	65 int PreCreateThreadsBegin() override;

66 void PreMainMessageLoopRun() override;	66 void PreMainMessageLoopRun() override;

67 bool MainMessageLoopRun(int* result_code) override;	67 bool MainMessageLoopRun(int* result_code) override;

68 void PostMainMessageLoopRun() override;	68 void PostMainMessageLoopRun() override;

69 void PostDestroyThreads() override;	69 void PostDestroyThreads() override;

70	70

71 protected:	71 protected:

72 // app_shell embedders may need custom extensions client interfaces.	72 // app_shell embedders may need custom extensions client interfaces.

73 // This class takes ownership of the returned objects.	73 // This class takes ownership of the returned objects.

74 virtual ExtensionsClient* CreateExtensionsClient();	74 virtual ExtensionsClient* CreateExtensionsClient();

75 virtual ExtensionsBrowserClient* CreateExtensionsBrowserClient(	75 virtual ExtensionsBrowserClient* CreateExtensionsBrowserClient(

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 #if !defined(DISABLE_NACL)	111 #if !defined(DISABLE_NACL)

112 base::CancelableTaskTracker task_tracker_;	112 base::CancelableTaskTracker task_tracker_;

113 #endif	113 #endif

114	114

115 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);	115 DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);

116 };	116 };

117	117

118 } // namespace extensions	118 } // namespace extensions

119	119

120 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_	120 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_

OLD	NEW