| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/toolbar_view.h" | 5 #include "chrome/browser/views/toolbar_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "app/drag_drop_types.h" | 10 #include "app/drag_drop_types.h" |
| 11 #include "app/gfx/canvas.h" | |
| 12 #include "app/l10n_util.h" | 11 #include "app/l10n_util.h" |
| 13 #include "app/os_exchange_data.h" | 12 #include "app/os_exchange_data.h" |
| 14 #include "app/resource_bundle.h" | 13 #include "app/resource_bundle.h" |
| 15 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 16 #include "base/keyboard_codes.h" | 15 #include "base/keyboard_codes.h" |
| 17 #include "base/logging.h" | 16 #include "base/logging.h" |
| 18 #include "base/path_service.h" | 17 #include "base/path_service.h" |
| 19 #include "chrome/app/chrome_dll_resource.h" | 18 #include "chrome/app/chrome_dll_resource.h" |
| 20 #include "chrome/browser/bookmarks/bookmark_model.h" | 19 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 21 #include "chrome/browser/browser.h" | 20 #include "chrome/browser/browser.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 36 #include "chrome/browser/views/browser_actions_container.h" | 35 #include "chrome/browser/views/browser_actions_container.h" |
| 37 #include "chrome/browser/views/event_utils.h" | 36 #include "chrome/browser/views/event_utils.h" |
| 38 #include "chrome/browser/views/go_button.h" | 37 #include "chrome/browser/views/go_button.h" |
| 39 #include "chrome/browser/views/location_bar_view.h" | 38 #include "chrome/browser/views/location_bar_view.h" |
| 40 #include "chrome/browser/views/toolbar_star_toggle.h" | 39 #include "chrome/browser/views/toolbar_star_toggle.h" |
| 41 #include "chrome/browser/view_ids.h" | 40 #include "chrome/browser/view_ids.h" |
| 42 #include "chrome/common/chrome_constants.h" | 41 #include "chrome/common/chrome_constants.h" |
| 43 #include "chrome/common/chrome_switches.h" | 42 #include "chrome/common/chrome_switches.h" |
| 44 #include "chrome/common/notification_service.h" | 43 #include "chrome/common/notification_service.h" |
| 45 #include "chrome/common/pref_names.h" | 44 #include "chrome/common/pref_names.h" |
| 45 #include "gfx/canvas.h" |
| 46 #include "grit/chromium_strings.h" | 46 #include "grit/chromium_strings.h" |
| 47 #include "grit/generated_resources.h" | 47 #include "grit/generated_resources.h" |
| 48 #include "grit/theme_resources.h" | 48 #include "grit/theme_resources.h" |
| 49 #include "net/base/net_util.h" | 49 #include "net/base/net_util.h" |
| 50 #include "views/background.h" | 50 #include "views/background.h" |
| 51 #include "views/controls/button/button_dropdown.h" | 51 #include "views/controls/button/button_dropdown.h" |
| 52 #include "views/controls/label.h" | 52 #include "views/controls/label.h" |
| 53 #include "views/controls/menu/menu_2.h" | 53 #include "views/controls/menu/menu_2.h" |
| 54 #include "views/drag_utils.h" | 54 #include "views/drag_utils.h" |
| 55 #include "views/window/non_client_view.h" | 55 #include "views/window/non_client_view.h" |
| (...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 page_menu_model_.reset(new PageMenuModel(this, browser_)); | 709 page_menu_model_.reset(new PageMenuModel(this, browser_)); |
| 710 page_menu_menu_.reset(new views::Menu2(page_menu_model_.get())); | 710 page_menu_menu_.reset(new views::Menu2(page_menu_model_.get())); |
| 711 page_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); | 711 page_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); |
| 712 } | 712 } |
| 713 | 713 |
| 714 void ToolbarView::RunAppMenu(const gfx::Point& pt) { | 714 void ToolbarView::RunAppMenu(const gfx::Point& pt) { |
| 715 if (app_menu_model_->BuildProfileSubMenu()) | 715 if (app_menu_model_->BuildProfileSubMenu()) |
| 716 app_menu_menu_->Rebuild(); | 716 app_menu_menu_->Rebuild(); |
| 717 app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); | 717 app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); |
| 718 } | 718 } |
| OLD | NEW |