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

Unified Diff: chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.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
Index: chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
index 3656bd5b3ea83ffc5866f6ce38d2e9b8a53070da..3e514bf11a4c916da5c5796fc0e13381fff62990 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
@@ -1,11 +1,13 @@
-
// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h"
-StatusIconLinuxWrapper::StatusIconLinuxWrapper(StatusIconLinux* status_icon)
+#include "ui/views/linux_ui/linux_ui.h"
+
+StatusIconLinuxWrapper::StatusIconLinuxWrapper(
+ views::StatusIconLinux* status_icon)
: menu_model_(NULL) {
status_icon_.reset(status_icon);
status_icon_->set_delegate(this);
@@ -49,9 +51,9 @@ void StatusIconLinuxWrapper::OnMenuStateChanged() {
StatusIconLinuxWrapper* StatusIconLinuxWrapper::CreateWrappedStatusIcon(
const gfx::ImageSkia& image,
const string16& tool_tip) {
- const ui::LinuxUI* linux_ui = ui::LinuxUI::instance();
+ const views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui) {
- scoped_ptr<StatusIconLinux> status_icon =
+ scoped_ptr<views::StatusIconLinux> status_icon =
linux_ui->CreateLinuxStatusIcon(image, tool_tip);
if (status_icon.get())
return new StatusIconLinuxWrapper(status_icon.release());

Powered by Google App Engine
This is Rietveld 408576698