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

Unified Diff: ui/views/linux_ui/linux_ui.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/linux_ui/linux_ui.h ('k') | ui/views/linux_ui/linux_ui.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/linux_ui/linux_ui.cc
diff --git a/ui/linux_ui/linux_ui.cc b/ui/views/linux_ui/linux_ui.cc
similarity index 79%
rename from ui/linux_ui/linux_ui.cc
rename to ui/views/linux_ui/linux_ui.cc
index 40ead2fc9fa32ecabd1c07f88c762a1bc5ce5a0b..201d0b29e56d1470bd1b3348f2cb30de88de1713 100644
--- a/ui/linux_ui/linux_ui.cc
+++ b/ui/views/linux_ui/linux_ui.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/linux_ui/linux_ui.h"
+#include "ui/views/linux_ui/linux_ui.h"
#include "ui/shell_dialogs/linux_shell_dialog.h"
namespace {
-ui::LinuxUI* g_linux_ui = NULL;
+views::LinuxUI* g_linux_ui = NULL;
} // namespace
-namespace ui {
+namespace views {
void LinuxUI::SetInstance(LinuxUI* instance) {
delete g_linux_ui;
@@ -25,4 +25,4 @@ const LinuxUI* LinuxUI::instance() {
return g_linux_ui;
}
-} // namespace ui
+} // namespace views
« no previous file with comments | « ui/views/linux_ui/linux_ui.h ('k') | ui/views/linux_ui/linux_ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698