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

Side by Side Diff: chrome/browser/ui/views/toolbar_view.cc

Issue 10834079: views: Extract Widget observer into its own header file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller.h ('k') | ui/views/bubble/bubble_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/toolbar_view.h" 5 #include "chrome/browser/ui/views/toolbar_view.h"
6 6
7 #include "base/i18n/number_formatting.h" 7 #include "base/i18n/number_formatting.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/command_updater.h" 10 #include "chrome/browser/command_updater.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "ui/base/l10n/l10n_util.h" 50 #include "ui/base/l10n/l10n_util.h"
51 #include "ui/base/layout.h" 51 #include "ui/base/layout.h"
52 #include "ui/base/resource/resource_bundle.h" 52 #include "ui/base/resource/resource_bundle.h"
53 #include "ui/base/theme_provider.h" 53 #include "ui/base/theme_provider.h"
54 #include "ui/gfx/canvas.h" 54 #include "ui/gfx/canvas.h"
55 #include "ui/gfx/image/canvas_image_source.h" 55 #include "ui/gfx/image/canvas_image_source.h"
56 #include "ui/views/controls/button/button_dropdown.h" 56 #include "ui/views/controls/button/button_dropdown.h"
57 #include "ui/views/controls/menu/menu_listener.h" 57 #include "ui/views/controls/menu/menu_listener.h"
58 #include "ui/views/focus/view_storage.h" 58 #include "ui/views/focus/view_storage.h"
59 #include "ui/views/widget/tooltip_manager.h" 59 #include "ui/views/widget/tooltip_manager.h"
60 #include "ui/views/widget/widget.h"
60 #include "ui/views/window/non_client_view.h" 61 #include "ui/views/window/non_client_view.h"
61 62
62 #if defined(OS_WIN) 63 #if defined(OS_WIN)
63 #include "chrome/browser/enumerate_modules_model_win.h" 64 #include "chrome/browser/enumerate_modules_model_win.h"
64 #include "chrome/browser/ui/views/critical_notification_bubble_view.h" 65 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
65 #if !defined(USE_AURA) 66 #if !defined(USE_AURA)
66 #include "chrome/browser/ui/views/app_menu_button_win.h" 67 #include "chrome/browser/ui/views/app_menu_button_win.h"
67 #endif 68 #endif
68 #endif 69 #endif
69 70
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 // LocationBarContainer is not a child of the ToolbarView. 1027 // LocationBarContainer is not a child of the ToolbarView.
1027 gfx::Point origin(bounds.origin()); 1028 gfx::Point origin(bounds.origin());
1028 views::View::ConvertPointToView(this, location_bar_container_->parent(), 1029 views::View::ConvertPointToView(this, location_bar_container_->parent(),
1029 &origin); 1030 &origin);
1030 gfx::Rect target_bounds(origin, bounds.size()); 1031 gfx::Rect target_bounds(origin, bounds.size());
1031 if (location_bar_container_->GetTargetBounds() != target_bounds) { 1032 if (location_bar_container_->GetTargetBounds() != target_bounds) {
1032 location_bar_container_->SetInToolbar(true); 1033 location_bar_container_->SetInToolbar(true);
1033 location_bar_container_->SetBoundsRect(target_bounds); 1034 location_bar_container_->SetBoundsRect(target_bounds);
1034 } 1035 }
1035 } 1036 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller.h ('k') | ui/views/bubble/bubble_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698