chrome/app/chrome_main_delegate.h - Issue 8356025: Move ContentMainDelegate to content/public/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/app/chrome_main_delegate.h

Issue 8356025: Move ContentMainDelegate to content/public/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head. Created 9 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 | Annotate | Revision Log

« no previous file with comments | « chrome/app/DEPS ('k') | chrome/app/chrome_main_delegate.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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_APP_CHROME_MAIN_DELEGATE_H_	5 #ifndef CHROME_APP_CHROME_MAIN_DELEGATE_H_

6 #define CHROME_APP_CHROME_MAIN_DELEGATE_H_	6 #define CHROME_APP_CHROME_MAIN_DELEGATE_H_

7 #pragma once	7 #pragma once

8	8

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

10 #include "base/metrics/stats_counters.h"	10 #include "base/metrics/stats_counters.h"

11 #include "chrome/common/chrome_content_client.h"	11 #include "chrome/common/chrome_content_client.h"

12 #include "content/app/content_main_delegate.h"	12 #include "content/public/app/content_main_delegate.h"

13	13

14 // Chrome implementation of ContentMainDelegate.	14 // Chrome implementation of ContentMainDelegate.

15 class ChromeMainDelegate : public content::ContentMainDelegate {	15 class ChromeMainDelegate : public content::ContentMainDelegate {

16 public:	16 public:

17 ChromeMainDelegate();	17 ChromeMainDelegate();

18 virtual ~ChromeMainDelegate();	18 virtual ~ChromeMainDelegate();

19	19

20 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;	20 virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;

21	21

22 #if defined(OS_MACOSX)	22 #if defined(OS_MACOSX)

(...skipping 20 matching lines...) Expand all Loading...
43 #endif	43 #endif

44	44

45 private:	45 private:

46 chrome::ChromeContentClient chrome_content_client_;	46 chrome::ChromeContentClient chrome_content_client_;

47 scoped_ptr<base::StatsScope<base::StatsCounterTimer> > startup_timer_;	47 scoped_ptr<base::StatsScope<base::StatsCounterTimer> > startup_timer_;

48	48

49 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegate);	49 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegate);

50 };	50 };

51	51

52 #endif // CHROME_APP_CHROME_MAIN_DELEGATE_H_	52 #endif // CHROME_APP_CHROME_MAIN_DELEGATE_H_

OLD	NEW