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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 12087017: Enable tab scrubbing by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix broken tests Created 7 years, 10 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/about_flags.cc ('k') | chrome/browser/ui/views/ash/tab_scrubber_browsertest.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ash/chrome_browser_main_extra_parts_ash.h" 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "chrome/browser/chrome_browser_main.h" 9 #include "chrome/browser/chrome_browser_main.h"
10 #include "chrome/browser/toolkit_extra_parts.h" 10 #include "chrome/browser/toolkit_extra_parts.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() { 58 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {
59 } 59 }
60 60
61 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() { 61 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {
62 } 62 }
63 63
64 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { 64 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
65 if (chrome::ShouldOpenAshOnStartup()) { 65 if (chrome::ShouldOpenAshOnStartup()) {
66 chrome::OpenAsh(); 66 chrome::OpenAsh();
67 if (CommandLine::ForCurrentProcess()->HasSwitch( 67 if (!CommandLine::ForCurrentProcess()->HasSwitch(
68 switches::kAshEnableTabScrubbing)) { 68 switches::kAshDisableTabScrubbing)) {
69 TabScrubber::GetInstance(); 69 TabScrubber::GetInstance();
70 } 70 }
71 } else { 71 } else {
72 #if !defined(OS_CHROMEOS) 72 #if !defined(OS_CHROMEOS)
73 gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateWin); 73 gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateWin);
74 ui::SelectFileDialog::SetShellDialogsDelegate( 74 ui::SelectFileDialog::SetShellDialogsDelegate(
75 &g_shell_dialogs_delegate.Get()); 75 &g_shell_dialogs_delegate.Get());
76 #endif 76 #endif
77 } 77 }
78 78
79 #if defined(FILE_MANAGER_EXTENSION) 79 #if defined(FILE_MANAGER_EXTENSION)
80 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory); 80 ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
81 #endif 81 #endif
82 } 82 }
83 83
84 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { 84 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
85 } 85 }
86 86
87 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 87 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
88 chrome::CloseAsh(); 88 chrome::CloseAsh();
89 } 89 }
90 90
91 namespace chrome { 91 namespace chrome {
92 92
93 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) { 93 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) {
94 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); 94 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
95 } 95 }
96 96
97 } // namespace chrome 97 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698