chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc - Issue 23922007: Merge the LinuxUI interface from its own .so into libviews.so.

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

Unified Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Issue 23922007: Merge the LinuxUI interface from its own .so into libviews.so. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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:

Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

index ad1ec3ff24c0f5570fcf7583d23b2605314e570b..328b5702aa2aa47e27d7004bdcabd8fd5f676f9e 100644

--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

@@ -14,7 +14,7 @@

#if defined(OS_LINUX)

#include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"

-#include "ui/linux_ui/linux_ui.h"

+#include "ui/views/linux_ui/linux_ui.h"

#else

#endif

@@ -62,7 +62,7 @@ void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {

#if !defined(USE_ASH) && defined(OS_LINUX) && defined(USE_X11)

// TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.

- ui::LinuxUI::SetInstance(BuildGtk2UI());

+ views::LinuxUI::SetInstance(BuildGtk2UI());

#endif

}