OLD | NEW |
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/views/frame/glass_browser_frame_view.h" | 5 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" |
6 | 6 |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/app/chrome_dll_resource.h" | 10 #include "chrome/app/chrome_dll_resource.h" |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 !frame()->client_view()->bounds().Intersects(rect); | 282 !frame()->client_view()->bounds().Intersects(rect); |
283 } | 283 } |
284 | 284 |
285 /////////////////////////////////////////////////////////////////////////////// | 285 /////////////////////////////////////////////////////////////////////////////// |
286 // GlassBrowserFrameView, views::ButtonListener overrides: | 286 // GlassBrowserFrameView, views::ButtonListener overrides: |
287 void GlassBrowserFrameView::ButtonPressed(views::Button* sender, | 287 void GlassBrowserFrameView::ButtonPressed(views::Button* sender, |
288 const ui::Event& event) { | 288 const ui::Event& event) { |
289 if (sender == new_avatar_button()) { | 289 if (sender == new_avatar_button()) { |
290 browser_view()->ShowAvatarBubbleFromAvatarButton( | 290 browser_view()->ShowAvatarBubbleFromAvatarButton( |
291 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT, | 291 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT, |
292 signin::GAIA_SERVICE_TYPE_NONE); | 292 signin::ManageAccountsParams()); |
293 } | 293 } |
294 } | 294 } |
295 | 295 |
296 /////////////////////////////////////////////////////////////////////////////// | 296 /////////////////////////////////////////////////////////////////////////////// |
297 // GlassBrowserFrameView, private: | 297 // GlassBrowserFrameView, private: |
298 | 298 |
299 int GlassBrowserFrameView::FrameBorderThickness() const { | 299 int GlassBrowserFrameView::FrameBorderThickness() const { |
300 return (frame()->IsMaximized() || frame()->IsFullscreen()) ? | 300 return (frame()->IsMaximized() || frame()->IsFullscreen()) ? |
301 0 : gfx::win::GetSystemMetricsInDIP(SM_CXSIZEFRAME); | 301 0 : gfx::win::GetSystemMetricsInDIP(SM_CXSIZEFRAME); |
302 } | 302 } |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
587 static bool initialized = false; | 587 static bool initialized = false; |
588 if (!initialized) { | 588 if (!initialized) { |
589 for (int i = 0; i < kThrobberIconCount; ++i) { | 589 for (int i = 0; i < kThrobberIconCount; ++i) { |
590 throbber_icons_[i] = | 590 throbber_icons_[i] = |
591 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); | 591 ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i); |
592 DCHECK(throbber_icons_[i]); | 592 DCHECK(throbber_icons_[i]); |
593 } | 593 } |
594 initialized = true; | 594 initialized = true; |
595 } | 595 } |
596 } | 596 } |
OLD | NEW |