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

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

Issue 7809013: Remove Animation When "Resuming" Window in Lion (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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/browser.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 profile_(profile), 249 profile_(profile),
250 window_(NULL), 250 window_(NULL),
251 ALLOW_THIS_IN_INITIALIZER_LIST( 251 ALLOW_THIS_IN_INITIALIZER_LIST(
252 tab_handler_(TabHandler::CreateTabHandler(this))), 252 tab_handler_(TabHandler::CreateTabHandler(this))),
253 command_updater_(this), 253 command_updater_(this),
254 toolbar_model_(this), 254 toolbar_model_(this),
255 chrome_updater_factory_(this), 255 chrome_updater_factory_(this),
256 is_attempting_to_close_browser_(false), 256 is_attempting_to_close_browser_(false),
257 cancel_download_confirmation_state_(NOT_PROMPTED), 257 cancel_download_confirmation_state_(NOT_PROMPTED),
258 show_state_(ui::SHOW_STATE_DEFAULT), 258 show_state_(ui::SHOW_STATE_DEFAULT),
259 is_session_restore_(false),
sky 2011/08/31 04:25:35 It seems like you only care about this in Show. Co
dhollowa 2011/08/31 16:06:09 I considered this, and I agree, it really is the "
259 method_factory_(this), 260 method_factory_(this),
260 block_command_execution_(false), 261 block_command_execution_(false),
261 last_blocked_command_id_(-1), 262 last_blocked_command_id_(-1),
262 last_blocked_command_disposition_(CURRENT_TAB), 263 last_blocked_command_disposition_(CURRENT_TAB),
263 pending_web_app_action_(NONE), 264 pending_web_app_action_(NONE),
264 ALLOW_THIS_IN_INITIALIZER_LIST( 265 ALLOW_THIS_IN_INITIALIZER_LIST(
265 tab_restore_service_delegate_( 266 tab_restore_service_delegate_(
266 new BrowserTabRestoreServiceDelegate(this))), 267 new BrowserTabRestoreServiceDelegate(this))),
267 ALLOW_THIS_IN_INITIALIZER_LIST( 268 ALLOW_THIS_IN_INITIALIZER_LIST(
268 synced_window_delegate_( 269 synced_window_delegate_(
(...skipping 4851 matching lines...) Expand 10 before | Expand all | Expand 10 after
5120 } 5121 }
5121 5122
5122 void Browser::ShowSyncSetup() { 5123 void Browser::ShowSyncSetup() {
5123 ProfileSyncService* service = 5124 ProfileSyncService* service =
5124 profile()->GetOriginalProfile()->GetProfileSyncService(); 5125 profile()->GetOriginalProfile()->GetProfileSyncService();
5125 if (service->HasSyncSetupCompleted()) 5126 if (service->HasSyncSetupCompleted())
5126 ShowOptionsTab(chrome::kSyncSetupSubPage); 5127 ShowOptionsTab(chrome::kSyncSetupSubPage);
5127 else 5128 else
5128 service->ShowLoginDialog(); 5129 service->ShowLoginDialog();
5129 } 5130 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698