| OLD | NEW |
| 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/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #if defined(TOOLKIT_USES_GTK) | 7 #if defined(TOOLKIT_USES_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 | 128 |
| 129 #if defined(OS_CHROMEOS) | 129 #if defined(OS_CHROMEOS) |
| 130 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" | 130 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" |
| 131 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" | 131 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" |
| 132 #endif | 132 #endif |
| 133 | 133 |
| 134 #if !defined(OS_CHROMEOS) || defined(USE_AURA) | 134 #if !defined(OS_CHROMEOS) || defined(USE_AURA) |
| 135 #include "chrome/browser/ui/views/download/download_shelf_view.h" | 135 #include "chrome/browser/ui/views/download/download_shelf_view.h" |
| 136 #endif | 136 #endif |
| 137 | 137 |
| 138 #if defined(TOUCH_UI) | 138 #if defined(USE_VIRTUAL_KEYBOARD) |
| 139 #include "chrome/browser/ui/touch/status_bubble_touch.h" | 139 #include "chrome/browser/ui/touch/status_bubble_touch.h" |
| 140 #endif | 140 #endif |
| 141 | 141 |
| 142 using base::TimeDelta; | 142 using base::TimeDelta; |
| 143 using views::ColumnSet; | 143 using views::ColumnSet; |
| 144 using views::GridLayout; | 144 using views::GridLayout; |
| 145 | 145 |
| 146 namespace { | 146 namespace { |
| 147 // The height of the status bubble. | 147 // The height of the status bubble. |
| 148 const int kStatusBubbleHeight = 20; | 148 const int kStatusBubbleHeight = 20; |
| (...skipping 1795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1944 views::SingleSplitView::VERTICAL_SPLIT, | 1944 views::SingleSplitView::VERTICAL_SPLIT, |
| 1945 this); | 1945 this); |
| 1946 contents_split_->set_id(VIEW_ID_CONTENTS_SPLIT); | 1946 contents_split_->set_id(VIEW_ID_CONTENTS_SPLIT); |
| 1947 contents_split_->SetAccessibleName( | 1947 contents_split_->SetAccessibleName( |
| 1948 l10n_util::GetStringUTF16(IDS_ACCNAME_WEB_CONTENTS)); | 1948 l10n_util::GetStringUTF16(IDS_ACCNAME_WEB_CONTENTS)); |
| 1949 contents_split_->set_background( | 1949 contents_split_->set_background( |
| 1950 views::Background::CreateSolidBackground(bg_color)); | 1950 views::Background::CreateSolidBackground(bg_color)); |
| 1951 AddChildView(contents_split_); | 1951 AddChildView(contents_split_); |
| 1952 set_contents_view(contents_split_); | 1952 set_contents_view(contents_split_); |
| 1953 | 1953 |
| 1954 #if defined(TOUCH_UI) | 1954 #if defined(USE_VIRTUAL_KEYBOARD) |
| 1955 status_bubble_.reset(new StatusBubbleTouch(contents_)); | 1955 status_bubble_.reset(new StatusBubbleTouch(contents_)); |
| 1956 #else | 1956 #else |
| 1957 status_bubble_.reset(new StatusBubbleViews(contents_)); | 1957 status_bubble_.reset(new StatusBubbleViews(contents_)); |
| 1958 #endif | 1958 #endif |
| 1959 | 1959 |
| 1960 #if defined(OS_WIN) && !defined(USE_AURA) | 1960 #if defined(OS_WIN) && !defined(USE_AURA) |
| 1961 InitSystemMenu(); | 1961 InitSystemMenu(); |
| 1962 | 1962 |
| 1963 // Create a custom JumpList and add it to an observer of TabRestoreService | 1963 // Create a custom JumpList and add it to an observer of TabRestoreService |
| 1964 // so we can update the custom JumpList when a tab is added or removed. | 1964 // so we can update the custom JumpList when a tab is added or removed. |
| (...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2638 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get()); | 2638 views::BubbleBorder::TOP_RIGHT, bounds, browser_.get()); |
| 2639 views::BubbleDelegateView::CreateBubble(bubble); | 2639 views::BubbleDelegateView::CreateBubble(bubble); |
| 2640 bubble->Show(); | 2640 bubble->Show(); |
| 2641 } | 2641 } |
| 2642 | 2642 |
| 2643 void BrowserView::ShowAvatarBubbleFromAvatarButton() { | 2643 void BrowserView::ShowAvatarBubbleFromAvatarButton() { |
| 2644 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); | 2644 AvatarMenuButton* button = frame_->GetAvatarMenuButton(); |
| 2645 if (button) | 2645 if (button) |
| 2646 button->ShowAvatarBubble(); | 2646 button->ShowAvatarBubble(); |
| 2647 } | 2647 } |
| OLD | NEW |