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

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

Issue 7834048: Preliminary work to allow Chrome to build with USE_AURA (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/themes/theme_service.cc ('k') | chrome/browser/ui/input_window_dialog_win.cc » ('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 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 #endif 479 #endif
480 params.app_name = DevToolsWindow::kDevToolsApp; 480 params.app_name = DevToolsWindow::kDevToolsApp;
481 return CreateWithParams(params); 481 return CreateWithParams(params);
482 } 482 }
483 483
484 void Browser::InitBrowserWindow() { 484 void Browser::InitBrowserWindow() {
485 DCHECK(!window_); 485 DCHECK(!window_);
486 486
487 window_ = CreateBrowserWindow(); 487 window_ = CreateBrowserWindow();
488 488
489 #if defined(OS_WIN) 489 #if defined(OS_WIN) && !defined(USE_AURA)
490 { 490 {
491 // TODO: This might hit the disk 491 // TODO: This might hit the disk
492 // http://code.google.com/p/chromium/issues/detail?id=61638 492 // http://code.google.com/p/chromium/issues/detail?id=61638
493 base::ThreadRestrictions::ScopedAllowIO allow_io; 493 base::ThreadRestrictions::ScopedAllowIO allow_io;
494 494
495 // Set the app user model id for this application to that of the application 495 // Set the app user model id for this application to that of the application
496 // name. See http://crbug.com/7028. 496 // name. See http://crbug.com/7028.
497 ui::win::SetAppIdForWindow( 497 ui::win::SetAppIdForWindow(
498 is_app() ? 498 is_app() ?
499 ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) : 499 ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) :
(...skipping 4688 matching lines...) Expand 10 before | Expand all | Expand 10 after
5188 profile()->GetOriginalProfile()->GetProfileSyncService(); 5188 profile()->GetOriginalProfile()->GetProfileSyncService();
5189 if (service->HasSyncSetupCompleted()) 5189 if (service->HasSyncSetupCompleted())
5190 ShowOptionsTab(chrome::kSyncSetupSubPage); 5190 ShowOptionsTab(chrome::kSyncSetupSubPage);
5191 else 5191 else
5192 service->ShowLoginDialog(); 5192 service->ShowLoginDialog();
5193 } 5193 }
5194 5194
5195 void Browser::ToggleSpeechInput() { 5195 void Browser::ToggleSpeechInput() {
5196 GetSelectedTabContentsWrapper()->render_view_host()->ToggleSpeechInput(); 5196 GetSelectedTabContentsWrapper()->render_view_host()->ToggleSpeechInput();
5197 } 5197 }
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/input_window_dialog_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698