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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_frame_view.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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
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 "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/themes/theme_service_factory.h" 11 #include "chrome/browser/themes/theme_service_factory.h"
12 #include "chrome/browser/ui/panels/panel.h" 12 #include "chrome/browser/ui/panels/panel.h"
13 #include "chrome/browser/ui/panels/panel_browser_view.h" 13 #include "chrome/browser/ui/panels/panel_browser_view.h"
14 #include "chrome/browser/ui/panels/panel_manager.h" 14 #include "chrome/browser/ui/panels/panel_manager.h"
15 #include "chrome/browser/ui/panels/panel_strip.h" 15 #include "chrome/browser/ui/panels/panel_strip.h"
16 #include "chrome/common/extensions/extension.h" 16 #include "chrome/common/extensions/extension.h"
17 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
18 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
19 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
20 #include "grit/theme_resources_standard.h"
21 #include "grit/ui_resources.h" 20 #include "grit/ui_resources.h"
22 #include "ui/base/accessibility/accessible_view_state.h" 21 #include "ui/base/accessibility/accessible_view_state.h"
23 #include "ui/base/hit_test.h" 22 #include "ui/base/hit_test.h"
24 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/resource/resource_bundle.h" 24 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/gfx/canvas.h" 25 #include "ui/gfx/canvas.h"
27 #include "ui/gfx/path.h" 26 #include "ui/gfx/path.h"
28 #include "ui/gfx/screen.h" 27 #include "ui/gfx/screen.h"
29 #include "ui/views/controls/button/image_button.h" 28 #include "ui/views/controls/button/image_button.h"
30 #include "ui/views/controls/label.h" 29 #include "ui/views/controls/label.h"
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 } 797 }
799 798
800 bool PanelBrowserFrameView::CanResize() const { 799 bool PanelBrowserFrameView::CanResize() const {
801 return panel_browser_view_->panel()->CanResizeByMouse() != 800 return panel_browser_view_->panel()->CanResizeByMouse() !=
802 panel::NOT_RESIZABLE; 801 panel::NOT_RESIZABLE;
803 } 802 }
804 803
805 bool PanelBrowserFrameView::IsShowingTitlebarOnly() const { 804 bool PanelBrowserFrameView::IsShowingTitlebarOnly() const {
806 return height() <= panel::kTitlebarHeight; 805 return height() <= panel::kTitlebarHeight;
807 } 806 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/media_stream_infobar_delegate.cc ('k') | chrome/browser/ui/panels/panel_browser_titlebar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698