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

Side by Side Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

Issue 288493008: UMA Metrics for the user menu, including vasquette-detection (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits Created 6 years, 7 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/views/frame/opaque_browser_frame_view.h" 5 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/profiles/profiles_state.h" 14 #include "chrome/browser/profiles/profiles_state.h"
15 #include "chrome/browser/signin/signin_header_helper.h"
15 #include "chrome/browser/themes/theme_properties.h" 16 #include "chrome/browser/themes/theme_properties.h"
16 #include "chrome/browser/ui/views/frame/browser_frame.h" 17 #include "chrome/browser/ui/views/frame/browser_frame.h"
17 #include "chrome/browser/ui/views/frame/browser_view.h" 18 #include "chrome/browser/ui/views/frame/browser_view.h"
18 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h" 19 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
19 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_speci fic.h" 20 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_speci fic.h"
20 #include "chrome/browser/ui/views/profiles/avatar_label.h" 21 #include "chrome/browser/ui/views/profiles/avatar_label.h"
21 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h" 22 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
22 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" 23 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
23 #include "chrome/browser/ui/views/tab_icon_view.h" 24 #include "chrome/browser/ui/views/tab_icon_view.h"
24 #include "chrome/browser/ui/views/tabs/tab_strip.h" 25 #include "chrome/browser/ui/views/tabs/tab_strip.h"
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 if (sender == minimize_button_) { 345 if (sender == minimize_button_) {
345 frame()->Minimize(); 346 frame()->Minimize();
346 } else if (sender == maximize_button_) { 347 } else if (sender == maximize_button_) {
347 frame()->Maximize(); 348 frame()->Maximize();
348 } else if (sender == restore_button_) { 349 } else if (sender == restore_button_) {
349 frame()->Restore(); 350 frame()->Restore();
350 } else if (sender == close_button_) { 351 } else if (sender == close_button_) {
351 frame()->Close(); 352 frame()->Close();
352 } else if (sender == new_avatar_button()) { 353 } else if (sender == new_avatar_button()) {
353 browser_view()->ShowAvatarBubbleFromAvatarButton( 354 browser_view()->ShowAvatarBubbleFromAvatarButton(
354 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT); 355 BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT,
356 signin::GAIA_SERVICE_TYPE_NONE);
355 } 357 }
356 } 358 }
357 359
358 void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, 360 void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
359 const gfx::Point& point) { 361 const gfx::Point& point) {
360 #if defined(OS_LINUX) 362 #if defined(OS_LINUX)
361 views::MenuRunner menu_runner(frame()->GetSystemMenuModel()); 363 views::MenuRunner menu_runner(frame()->GetSystemMenuModel());
362 ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), 364 ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
363 window_icon_, 365 window_icon_,
364 window_icon_->GetBoundsInScreen(), 366 window_icon_->GetBoundsInScreen(),
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 904
903 int OpaqueBrowserFrameView::GetTopAreaHeight() const { 905 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
904 gfx::ImageSkia* frame_image = GetFrameImage(); 906 gfx::ImageSkia* frame_image = GetFrameImage();
905 int top_area_height = frame_image->height(); 907 int top_area_height = frame_image->height();
906 if (browser_view()->IsTabStripVisible()) { 908 if (browser_view()->IsTabStripVisible()) {
907 top_area_height = std::max(top_area_height, 909 top_area_height = std::max(top_area_height,
908 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom()); 910 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
909 } 911 }
910 return top_area_height; 912 return top_area_height;
911 } 913 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698