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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/linux_ui/linux_ui.h" 5 #include "ui/views/linux_ui/linux_ui.h"
6 6
7 #include "ui/shell_dialogs/linux_shell_dialog.h" 7 #include "ui/shell_dialogs/linux_shell_dialog.h"
8 8
9 namespace { 9 namespace {
10 10
11 ui::LinuxUI* g_linux_ui = NULL; 11 views::LinuxUI* g_linux_ui = NULL;
12 12
13 } // namespace 13 } // namespace
14 14
15 namespace ui { 15 namespace views {
16 16
17 void LinuxUI::SetInstance(LinuxUI* instance) { 17 void LinuxUI::SetInstance(LinuxUI* instance) {
18 delete g_linux_ui; 18 delete g_linux_ui;
19 g_linux_ui = instance; 19 g_linux_ui = instance;
20 20
21 LinuxShellDialog::SetInstance(instance); 21 LinuxShellDialog::SetInstance(instance);
22 } 22 }
23 23
24 const LinuxUI* LinuxUI::instance() { 24 const LinuxUI* LinuxUI::instance() {
25 return g_linux_ui; 25 return g_linux_ui;
26 } 26 }
27 27
28 } // namespace ui 28 } // namespace views
OLDNEW
« 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