diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
| tree | 382278a54ce7a744d62fa510a9a80688cc12434b /chrome/browser/chromeos/wm_overview_title.cc | |
| parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
| download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 | |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'chrome/browser/chromeos/wm_overview_title.cc')
| -rw-r--r-- | chrome/browser/chromeos/wm_overview_title.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/wm_overview_title.cc b/chrome/browser/chromeos/wm_overview_title.cc index 7c6c5b6..7892f18 100644 --- a/chrome/browser/chromeos/wm_overview_title.cc +++ b/chrome/browser/chromeos/wm_overview_title.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,18 +6,17 @@ #include <vector> -#include "app/x11_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/chromeos/drop_shadow_label.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/chromeos/wm_overview_snapshot.h" -#include "chrome/browser/ui/browser.h" #include "third_party/cros/chromeos_wm_ipc_enums.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/x/x11_util.h" #include "views/border.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/view.h" using std::vector; @@ -98,7 +97,7 @@ void WmOverviewTitle::Init(const gfx::Size& size, // Set the window type vector<int> params; - params.push_back(x11_util::GetX11WindowFromGtkWidget( + params.push_back(ui::GetX11WindowFromGtkWidget( GTK_WIDGET(snapshot->GetNativeView()))); WmIpc::instance()->SetWindowType( GetNativeView(), |