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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1130 WindowOpenDisposition disposition, | 1130 WindowOpenDisposition disposition, |
1131 const gfx::Rect& initial_pos, | 1131 const gfx::Rect& initial_pos, |
1132 bool user_gesture) { | 1132 bool user_gesture) { |
1133 AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture); | 1133 AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture); |
1134 } | 1134 } |
1135 | 1135 |
1136 void Browser::CloseTabContents(TabContents* contents) { | 1136 void Browser::CloseTabContents(TabContents* contents) { |
1137 CloseContents(contents); | 1137 CloseContents(contents); |
1138 } | 1138 } |
1139 | 1139 |
1140 void Browser::BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, | 1140 gfx::NativeWindow Browser::BrowserShowHtmlDialog( |
1141 gfx::NativeWindow parent_window) { | 1141 HtmlDialogUIDelegate* delegate, gfx::NativeWindow parent_window) { |
1142 window_->ShowHTMLDialog(delegate, parent_window); | 1142 return window_->ShowHTMLDialog(delegate, parent_window); |
1143 } | 1143 } |
1144 | 1144 |
1145 void Browser::BrowserRenderWidgetShowing() { | 1145 void Browser::BrowserRenderWidgetShowing() { |
1146 RenderWidgetShowing(); | 1146 RenderWidgetShowing(); |
1147 } | 1147 } |
1148 | 1148 |
1149 void Browser::BookmarkBarSizeChanged(bool is_animating) { | 1149 void Browser::BookmarkBarSizeChanged(bool is_animating) { |
1150 window_->ToolbarSizeChanged(is_animating); | 1150 window_->ToolbarSizeChanged(is_animating); |
1151 } | 1151 } |
1152 | 1152 |
(...skipping 3687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4840 } | 4840 } |
4841 | 4841 |
4842 void Browser::ShowSyncSetup() { | 4842 void Browser::ShowSyncSetup() { |
4843 ProfileSyncService* service = | 4843 ProfileSyncService* service = |
4844 profile()->GetOriginalProfile()->GetProfileSyncService(); | 4844 profile()->GetOriginalProfile()->GetProfileSyncService(); |
4845 if (service->HasSyncSetupCompleted()) | 4845 if (service->HasSyncSetupCompleted()) |
4846 ShowOptionsTab(chrome::kSyncSetupSubPage); | 4846 ShowOptionsTab(chrome::kSyncSetupSubPage); |
4847 else | 4847 else |
4848 service->ShowLoginDialog(); | 4848 service->ShowLoginDialog(); |
4849 } | 4849 } |
OLD | NEW |