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

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

Issue 8479042: UI polish for certificate viewer (Closed) Base URL: /usr/local/google/home/bshe/NoTouchChromium/../TouchChromium/src/@trunk
Patch Set: Edit comments. Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_dialogs.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) 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 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 bool user_gesture) { 1211 bool user_gesture) {
1212 AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture); 1212 AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture);
1213 } 1213 }
1214 1214
1215 void Browser::CloseTabContents(TabContents* contents) { 1215 void Browser::CloseTabContents(TabContents* contents) {
1216 CloseContents(contents); 1216 CloseContents(contents);
1217 } 1217 }
1218 1218
1219 gfx::NativeWindow Browser::BrowserShowHtmlDialog( 1219 gfx::NativeWindow Browser::BrowserShowHtmlDialog(
1220 HtmlDialogUIDelegate* delegate, 1220 HtmlDialogUIDelegate* delegate,
1221 gfx::NativeWindow parent_window) { 1221 gfx::NativeWindow parent_window,
1222 DialogStyle style) {
1222 #if defined(OS_CHROMEOS) 1223 #if defined(OS_CHROMEOS)
1223 // For Chrome OS, first try to parent the dialog over the current browser -- 1224 // For Chrome OS, first try to parent the dialog over the current browser --
1224 // it's likely to be maximized onscreen. If it isn't tabbed (e.g. it's a 1225 // it's likely to be maximized onscreen. If it isn't tabbed (e.g. it's a
1225 // panel), find a browser that is. 1226 // panel), find a browser that is.
1226 parent_window = window_->GetNativeHandle(); 1227 parent_window = window_->GetNativeHandle();
1227 if (!is_type_tabbed()) { 1228 if (!is_type_tabbed()) {
1228 Browser* tabbed_browser = BrowserList::FindTabbedBrowser(profile_, true); 1229 Browser* tabbed_browser = BrowserList::FindTabbedBrowser(profile_, true);
1229 if (tabbed_browser && tabbed_browser->window()) 1230 if (tabbed_browser && tabbed_browser->window())
1230 parent_window = tabbed_browser->window()->GetNativeHandle(); 1231 parent_window = tabbed_browser->window()->GetNativeHandle();
1231 } 1232 }
1232 #endif // defined(OS_CHROMEOS) 1233 #endif // defined(OS_CHROMEOS)
1233 if (!parent_window) 1234 if (!parent_window)
1234 parent_window = window_->GetNativeHandle(); 1235 parent_window = window_->GetNativeHandle();
1235 1236
1236 return browser::ShowHtmlDialog(parent_window, profile_, delegate); 1237 return browser::ShowHtmlDialog(parent_window, profile_, delegate, style);
1237 } 1238 }
1238 1239
1239 void Browser::BrowserRenderWidgetShowing() { 1240 void Browser::BrowserRenderWidgetShowing() {
1240 RenderWidgetShowing(); 1241 RenderWidgetShowing();
1241 } 1242 }
1242 1243
1243 void Browser::BookmarkBarSizeChanged(bool is_animating) { 1244 void Browser::BookmarkBarSizeChanged(bool is_animating) {
1244 window_->ToolbarSizeChanged(is_animating); 1245 window_->ToolbarSizeChanged(is_animating);
1245 } 1246 }
1246 1247
(...skipping 4025 matching lines...) Expand 10 before | Expand all | Expand 10 after
5272 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); 5273 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
5273 } else if (is_type_tabbed()) { 5274 } else if (is_type_tabbed()) {
5274 GlobalErrorService* service = 5275 GlobalErrorService* service =
5275 GlobalErrorServiceFactory::GetForProfile(profile()); 5276 GlobalErrorServiceFactory::GetForProfile(profile());
5276 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5277 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5277 if (error) { 5278 if (error) {
5278 error->ShowBubbleView(this); 5279 error->ShowBubbleView(this);
5279 } 5280 }
5280 } 5281 }
5281 } 5282 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_dialogs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698