ash/shell/content_client/shell_main_delegate.cc - Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

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: ash/shell/content_client/shell_main_delegate.cc

Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 years, 4 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 | « ash/drag_drop/drag_drop_interactive_uitest.cc ('k') | ash/shell/shell_main_parts.cc » ('j') | no next file with comments »

OLD	NEW
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 #include "ash/shell/content_client/shell_main_delegate.h"	5 #include "ash/shell/content_client/shell_main_delegate.h"

6	6

7 #include "ash/shell/content_client/shell_content_browser_client.h"	7 #include "ash/shell/content_client/shell_content_browser_client.h"

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

9 #include "content/public/common/content_switches.h"	9 #include "content/public/common/content_switches.h"

10 #include "ui/base/resource/resource_bundle.h"	10 #include "ui/base/resource/resource_bundle.h"

(...skipping 20 matching lines...) Expand all Loading...
31 void ShellMainDelegate::PreSandboxStartup() {	31 void ShellMainDelegate::PreSandboxStartup() {

32 InitializeResourceBundle();	32 InitializeResourceBundle();

33 }	33 }

34	34

35 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {	35 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {

36 browser_client_.reset(new ShellContentBrowserClient);	36 browser_client_.reset(new ShellContentBrowserClient);

37 return browser_client_.get();	37 return browser_client_.get();

38 }	38 }

39	39

40 void ShellMainDelegate::InitializeResourceBundle() {	40 void ShellMainDelegate::InitializeResourceBundle() {

41 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);	41 ui::ResourceBundle::InitSharedInstanceWithLocale(

	42 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);

42 }	43 }

43	44

44 } // namespace shell	45 } // namespace shell

45 } // namespace ash	46 } // namespace ash

OLD	NEW