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

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

Issue 58853004: [win8] Force browsers created with Chrome in Metro mode to be on the Ash desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move from browser_commands to BrowserWindow Created 7 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 | « build/filename_rules.gypi ('k') | chrome/browser/ui/browser_window.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/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 // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 window_(NULL), 326 window_(NULL),
327 tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)), 327 tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)),
328 tab_strip_model_(new TabStripModel(tab_strip_model_delegate_.get(), 328 tab_strip_model_(new TabStripModel(tab_strip_model_delegate_.get(),
329 params.profile)), 329 params.profile)),
330 app_name_(params.app_name), 330 app_name_(params.app_name),
331 app_type_(params.app_type), 331 app_type_(params.app_type),
332 cancel_download_confirmation_state_(NOT_PROMPTED), 332 cancel_download_confirmation_state_(NOT_PROMPTED),
333 override_bounds_(params.initial_bounds), 333 override_bounds_(params.initial_bounds),
334 initial_show_state_(params.initial_show_state), 334 initial_show_state_(params.initial_show_state),
335 is_session_restore_(params.is_session_restore), 335 is_session_restore_(params.is_session_restore),
336 host_desktop_type_(params.host_desktop_type), 336 host_desktop_type_(BrowserWindow::AdjustHostDesktopType(
337 params.host_desktop_type)),
337 content_setting_bubble_model_delegate_( 338 content_setting_bubble_model_delegate_(
338 new BrowserContentSettingBubbleModelDelegate(this)), 339 new BrowserContentSettingBubbleModelDelegate(this)),
339 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)), 340 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)),
340 tab_restore_service_delegate_(new BrowserTabRestoreServiceDelegate(this)), 341 tab_restore_service_delegate_(new BrowserTabRestoreServiceDelegate(this)),
341 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)), 342 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)),
342 bookmark_bar_state_(BookmarkBar::HIDDEN), 343 bookmark_bar_state_(BookmarkBar::HIDDEN),
343 command_controller_(new chrome::BrowserCommandController( 344 command_controller_(new chrome::BrowserCommandController(
344 this, g_browser_process->profile_manager())), 345 this, g_browser_process->profile_manager())),
345 window_has_shown_(false), 346 window_has_shown_(false),
346 chrome_updater_factory_(this), 347 chrome_updater_factory_(this),
(...skipping 1924 matching lines...) Expand 10 before | Expand all | Expand 10 after
2271 if (contents && !allow_js_access) { 2272 if (contents && !allow_js_access) {
2272 contents->web_contents()->GetController().LoadURL( 2273 contents->web_contents()->GetController().LoadURL(
2273 target_url, 2274 target_url,
2274 content::Referrer(), 2275 content::Referrer(),
2275 content::PAGE_TRANSITION_LINK, 2276 content::PAGE_TRANSITION_LINK,
2276 std::string()); // No extra headers. 2277 std::string()); // No extra headers.
2277 } 2278 }
2278 2279
2279 return contents != NULL; 2280 return contents != NULL;
2280 } 2281 }
OLDNEW
« no previous file with comments | « build/filename_rules.gypi ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698