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

Side by Side Diff: chrome/browser/browser_init.cc

Issue 24011: chrome_resources take 2 (Closed)
Patch Set: rebase Created 11 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/browser_init.h" 5 #include "chrome/browser/browser_init.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/event_recorder.h" 9 #include "base/event_recorder.h"
10 #include "base/histogram.h" 10 #include "base/histogram.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/common/l10n_util.h" 28 #include "chrome/common/l10n_util.h"
29 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "chrome/common/pref_service.h" 30 #include "chrome/common/pref_service.h"
31 #include "net/base/cookie_monster.h" 31 #include "net/base/cookie_monster.h"
32 #include "webkit/glue/webkit_glue.h" 32 #include "webkit/glue/webkit_glue.h"
33 33
34 #if defined(OS_WIN) 34 #if defined(OS_WIN)
35 35
36 #include "base/win_util.h" 36 #include "base/win_util.h"
37 #include "chrome/app/locales/locale_settings.h" 37 #include "chrome/app/locales/locale_settings.h"
38 #include "chrome/app/theme/theme_resources.h" 38 #include "grit/theme_resources.h"
39 #include "chrome/browser/automation/automation_provider.h" 39 #include "chrome/browser/automation/automation_provider.h"
40 #include "chrome/browser/automation/automation_provider_list.h" 40 #include "chrome/browser/automation/automation_provider_list.h"
41 #include "chrome/browser/net/url_fixer_upper.h" 41 #include "chrome/browser/net/url_fixer_upper.h"
42 #include "chrome/browser/sessions/session_restore.h" 42 #include "chrome/browser/sessions/session_restore.h"
43 #include "chrome/browser/tab_contents/infobar_delegate.h" 43 #include "chrome/browser/tab_contents/infobar_delegate.h"
44 #include "chrome/common/resource_bundle.h" 44 #include "chrome/common/resource_bundle.h"
45 45
46 #include "chromium_strings.h" 46 #include "chromium_strings.h"
47 #include "generated_resources.h" 47 #include "generated_resources.h"
48 48
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 bool launched = lwp.Launch(profile, process_startup); 548 bool launched = lwp.Launch(profile, process_startup);
549 if (!launched) { 549 if (!launched) {
550 LOG(ERROR) << "launch error"; 550 LOG(ERROR) << "launch error";
551 if (return_code != NULL) 551 if (return_code != NULL)
552 *return_code = ResultCodes::INVALID_CMDLINE_URL; 552 *return_code = ResultCodes::INVALID_CMDLINE_URL;
553 return false; 553 return false;
554 } 554 }
555 555
556 return true; 556 return true;
557 } 557 }
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_table_model.cc ('k') | chrome/browser/download/download_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698