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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_frame_view.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/ui/panels/panel_browser_frame_view.h" 5 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/themes/theme_service.h" 10 #include "chrome/browser/themes/theme_service.h"
11 #include "chrome/browser/ui/panels/panel.h" 11 #include "chrome/browser/ui/panels/panel.h"
12 #include "chrome/browser/ui/panels/panel_browser_view.h" 12 #include "chrome/browser/ui/panels/panel_browser_view.h"
13 #include "chrome/browser/ui/panels/panel_manager.h" 13 #include "chrome/browser/ui/panels/panel_manager.h"
14 #include "chrome/browser/ui/panels/panel_settings_menu_model.h" 14 #include "chrome/browser/ui/panels/panel_settings_menu_model.h"
15 #include "chrome/common/extensions/extension.h" 15 #include "chrome/common/extensions/extension.h"
16 #include "content/browser/tab_contents/tab_contents.h" 16 #include "content/browser/tab_contents/tab_contents.h"
17 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "grit/theme_resources_standard.h" 19 #include "grit/theme_resources_standard.h"
20 #include "grit/ui_resources.h" 20 #include "grit/ui_resources.h"
21 #include "third_party/skia/include/effects/SkGradientShader.h" 21 #include "third_party/skia/include/effects/SkGradientShader.h"
22 #include "ui/base/accessibility/accessible_view_state.h" 22 #include "ui/base/accessibility/accessible_view_state.h"
23 #include "ui/base/animation/slide_animation.h" 23 #include "ui/base/animation/slide_animation.h"
24 #include "ui/base/hit_test.h" 24 #include "ui/base/hit_test.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
27 #include "ui/gfx/canvas_skia.h" 27 #include "ui/gfx/canvas_skia.h"
28 #include "ui/gfx/path.h" 28 #include "ui/gfx/path.h"
29 #include "ui/gfx/screen.h" 29 #include "ui/gfx/screen.h"
30 #include "ui/views/widget/widget_delegate.h"
30 #include "views/controls/button/image_button.h" 31 #include "views/controls/button/image_button.h"
31 #include "views/controls/button/menu_button.h" 32 #include "views/controls/button/menu_button.h"
33 #include "views/controls/label.h"
32 #include "views/controls/menu/menu_item_view.h" 34 #include "views/controls/menu/menu_item_view.h"
33 #include "views/controls/menu/menu_model_adapter.h" 35 #include "views/controls/menu/menu_model_adapter.h"
34 #include "views/controls/menu/menu_runner.h" 36 #include "views/controls/menu/menu_runner.h"
35 #include "views/controls/label.h"
36 #include "views/painter.h" 37 #include "views/painter.h"
37 #include "views/widget/widget_delegate.h"
38 38
39 namespace { 39 namespace {
40 40
41 // The height in pixels of the titlebar. 41 // The height in pixels of the titlebar.
42 const int kTitlebarHeight = 24; 42 const int kTitlebarHeight = 24;
43 43
44 // The thickness in pixels of the frame border. 44 // The thickness in pixels of the frame border.
45 const int kFrameBorderThickness = 1; 45 const int kFrameBorderThickness = 1;
46 46
47 // The spacing in pixels between the icon and the border/text. 47 // The spacing in pixels between the icon and the border/text.
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 769
770 settings_menu_model_.reset( 770 settings_menu_model_.reset(
771 new PanelSettingsMenuModel(panel_browser_view_->panel())); 771 new PanelSettingsMenuModel(panel_browser_view_->panel()));
772 settings_menu_adapter_.reset( 772 settings_menu_adapter_.reset(
773 new views::MenuModelAdapter(settings_menu_model_.get())); 773 new views::MenuModelAdapter(settings_menu_model_.get()));
774 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); 774 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get());
775 settings_menu_adapter_->BuildMenu(settings_menu_); 775 settings_menu_adapter_->BuildMenu(settings_menu_);
776 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); 776 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_));
777 return true; 777 return true;
778 } 778 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/auto_hiding_desktop_bar_win.cc ('k') | chrome/browser/ui/panels/panel_browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698