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

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

Issue 24544004: Remove the chrome namespace around ChromeContent[Renderer]Client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 1 month 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 | « no previous file | chrome/app/chrome_main_delegate.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) 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 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/metrics/stats_counters.h" 9 #include "base/metrics/stats_counters.h"
10 #include "chrome/common/chrome_content_client.h" 10 #include "chrome/common/chrome_content_client.h"
(...skipping 28 matching lines...) Expand all
39 virtual content::ContentPluginClient* CreateContentPluginClient() OVERRIDE; 39 virtual content::ContentPluginClient* CreateContentPluginClient() OVERRIDE;
40 virtual content::ContentRendererClient* 40 virtual content::ContentRendererClient*
41 CreateContentRendererClient() OVERRIDE; 41 CreateContentRendererClient() OVERRIDE;
42 virtual content::ContentUtilityClient* CreateContentUtilityClient() OVERRIDE; 42 virtual content::ContentUtilityClient* CreateContentUtilityClient() OVERRIDE;
43 43
44 #if defined(OS_MACOSX) 44 #if defined(OS_MACOSX)
45 void InitMacCrashReporter(const CommandLine& command_line, 45 void InitMacCrashReporter(const CommandLine& command_line,
46 const std::string& process_type); 46 const std::string& process_type);
47 #endif // defined(OS_MACOSX) 47 #endif // defined(OS_MACOSX)
48 48
49 chrome::ChromeContentClient chrome_content_client_; 49 ChromeContentClient chrome_content_client_;
50 50
51 // startup_timer_ will hold a reference to stats_counter_timer_. Therefore, 51 // startup_timer_ will hold a reference to stats_counter_timer_. Therefore,
52 // the declaration order of these variables matters. Changing this order will 52 // the declaration order of these variables matters. Changing this order will
53 // cause startup_timer_ to be freed before stats_counter_timer_, leaving a 53 // cause startup_timer_ to be freed before stats_counter_timer_, leaving a
54 // dangling reference. 54 // dangling reference.
55 scoped_ptr<base::StatsCounterTimer> stats_counter_timer_; 55 scoped_ptr<base::StatsCounterTimer> stats_counter_timer_;
56 scoped_ptr<base::StatsScope<base::StatsCounterTimer> > startup_timer_; 56 scoped_ptr<base::StatsScope<base::StatsCounterTimer> > startup_timer_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegate); 58 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegate);
59 }; 59 };
60 60
61 #endif // CHROME_APP_CHROME_MAIN_DELEGATE_H_ 61 #endif // CHROME_APP_CHROME_MAIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chrome_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698