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

Side by Side Diff: chrome/browser/chromeos/frame/panel_controller.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/chromeos/frame/panel_controller.h" 5 #include "chrome/browser/chromeos/frame/panel_controller.h"
6 6
7 #if defined(TOUCH_UI) 7 #if defined(TOUCH_UI)
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 #endif 10 #endif
(...skipping 11 matching lines...) Expand all
22 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 #include "grit/theme_resources.h" 23 #include "grit/theme_resources.h"
24 #include "grit/theme_resources_standard.h" 24 #include "grit/theme_resources_standard.h"
25 #include "grit/ui_resources.h" 25 #include "grit/ui_resources.h"
26 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" 26 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
27 #include "third_party/skia/include/effects/SkBlurMaskFilter.h" 27 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
28 #include "third_party/skia/include/effects/SkGradientShader.h" 28 #include "third_party/skia/include/effects/SkGradientShader.h"
29 #include "ui/base/resource/resource_bundle.h" 29 #include "ui/base/resource/resource_bundle.h"
30 #include "ui/gfx/canvas_skia.h" 30 #include "ui/gfx/canvas_skia.h"
31 #include "ui/views/events/event.h" 31 #include "ui/views/events/event.h"
32 #include "ui/views/widget/widget.h"
32 #include "views/controls/button/image_button.h" 33 #include "views/controls/button/image_button.h"
33 #include "views/controls/image_view.h" 34 #include "views/controls/image_view.h"
34 #include "views/controls/label.h" 35 #include "views/controls/label.h"
35 #include "views/painter.h" 36 #include "views/painter.h"
36 #include "views/view.h" 37 #include "views/view.h"
37 #include "views/widget/widget.h"
38 38
39 #if defined(TOOLKIT_USES_GTK) 39 #if defined(TOOLKIT_USES_GTK)
40 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" 40 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
41 #endif 41 #endif
42 42
43 #if defined(TOUCH_UI) 43 #if defined(TOUCH_UI)
44 namespace { 44 namespace {
45 45
46 gfx::Point RootLocationFromXEvent(const XEvent* xev) { 46 gfx::Point RootLocationFromXEvent(const XEvent* xev) {
47 switch (xev->type) { 47 switch (xev->type) {
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 views::Button* sender, const views::Event& event) { 524 views::Button* sender, const views::Event& event) {
525 if (panel_controller_ && sender == close_button_) 525 if (panel_controller_ && sender == close_button_)
526 panel_controller_->OnCloseButtonPressed(); 526 panel_controller_->OnCloseButtonPressed();
527 } 527 }
528 528
529 PanelController::TitleContentView::~TitleContentView() { 529 PanelController::TitleContentView::~TitleContentView() {
530 VLOG(1) << "panel: delete " << this; 530 VLOG(1) << "panel: delete " << this;
531 } 531 }
532 532
533 } // namespace chromeos 533 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/frame/panel_browser_view.cc ('k') | chrome/browser/chromeos/input_method/candidate_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698