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

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

Issue 8591003: aura: Fix Chrome OS status area browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with sky's (currently-reverted) change 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/layout_mode_button.h" 5 #include "chrome/browser/chromeos/frame/layout_mode_button.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/chromeos/view_ids.h"
9 #include "chrome/common/chrome_notification_types.h" 10 #include "chrome/common/chrome_notification_types.h"
10 #include "content/public/browser/notification_details.h" 11 #include "content/public/browser/notification_details.h"
11 #include "content/public/browser/notification_source.h" 12 #include "content/public/browser/notification_source.h"
12 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
13 #include "grit/theme_resources.h" 14 #include "grit/theme_resources.h"
14 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" 15 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
15 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
17 #include "views/widget/widget.h" 18 #include "views/widget/widget.h"
18 19
19 #if defined(TOOLKIT_USES_GTK) 20 #if defined(TOOLKIT_USES_GTK)
20 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" 21 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
21 #endif 22 #endif
22 23
23 namespace { 24 namespace {
24 const int kHorizontalPaddingPixels = 2; 25 const int kHorizontalPaddingPixels = 2;
25 } // namespace 26 } // namespace
26 27
27 namespace chromeos { 28 namespace chromeos {
28 29
29 LayoutModeButton::LayoutModeButton() 30 LayoutModeButton::LayoutModeButton()
30 : ALLOW_THIS_IN_INITIALIZER_LIST(ImageButton(this)) { 31 : ALLOW_THIS_IN_INITIALIZER_LIST(ImageButton(this)) {
32 set_id(VIEW_ID_LAYOUT_MODE_BUTTON);
31 } 33 }
32 34
33 LayoutModeButton::~LayoutModeButton() { 35 LayoutModeButton::~LayoutModeButton() {
34 } 36 }
35 37
36 gfx::Size LayoutModeButton::GetPreferredSize() { 38 gfx::Size LayoutModeButton::GetPreferredSize() {
37 gfx::Size size = ImageButton::GetPreferredSize(); 39 gfx::Size size = ImageButton::GetPreferredSize();
38 size.Enlarge(2 * kHorizontalPaddingPixels, 0); 40 size.Enlarge(2 * kHorizontalPaddingPixels, 0);
39 return size; 41 return size;
40 } 42 }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 SetTooltipText( 103 SetTooltipText(
102 l10n_util::GetStringUTF16(IDS_STATUSBAR_WINDOW_MAXIMIZE_TOOLTIP)); 104 l10n_util::GetStringUTF16(IDS_STATUSBAR_WINDOW_MAXIMIZE_TOOLTIP));
103 break; 105 break;
104 default: 106 default:
105 DLOG(WARNING) << "Unknown layout mode " << mode; 107 DLOG(WARNING) << "Unknown layout mode " << mode;
106 } 108 }
107 #endif 109 #endif
108 } 110 }
109 111
110 } // namespace chromeos 112 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698