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

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

Issue 1927203003: Add support for X11 workspaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed GetSavedWindowWorkspace, put command line code into browser_frame.cc Created 4 years, 7 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
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 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 profile_(params.profile), 372 profile_(params.profile),
373 window_(NULL), 373 window_(NULL),
374 tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)), 374 tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)),
375 tab_strip_model_( 375 tab_strip_model_(
376 new TabStripModel(tab_strip_model_delegate_.get(), params.profile)), 376 new TabStripModel(tab_strip_model_delegate_.get(), params.profile)),
377 app_name_(params.app_name), 377 app_name_(params.app_name),
378 is_trusted_source_(params.trusted_source), 378 is_trusted_source_(params.trusted_source),
379 cancel_download_confirmation_state_(NOT_PROMPTED), 379 cancel_download_confirmation_state_(NOT_PROMPTED),
380 override_bounds_(params.initial_bounds), 380 override_bounds_(params.initial_bounds),
381 initial_show_state_(params.initial_show_state), 381 initial_show_state_(params.initial_show_state),
382 initial_workspace_(params.initial_workspace),
382 is_session_restore_(params.is_session_restore), 383 is_session_restore_(params.is_session_restore),
383 content_setting_bubble_model_delegate_( 384 content_setting_bubble_model_delegate_(
384 new BrowserContentSettingBubbleModelDelegate(this)), 385 new BrowserContentSettingBubbleModelDelegate(this)),
385 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)), 386 toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)),
386 live_tab_context_(new BrowserLiveTabContext(this)), 387 live_tab_context_(new BrowserLiveTabContext(this)),
387 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)), 388 synced_window_delegate_(new BrowserSyncedWindowDelegate(this)),
388 bookmark_bar_state_(BookmarkBar::HIDDEN), 389 bookmark_bar_state_(BookmarkBar::HIDDEN),
389 command_controller_(new chrome::BrowserCommandController(this)), 390 command_controller_(new chrome::BrowserCommandController(this)),
390 window_has_shown_(false), 391 window_has_shown_(false),
391 chrome_updater_factory_(this), 392 chrome_updater_factory_(this),
(...skipping 2353 matching lines...) Expand 10 before | Expand all | Expand 10 after
2745 if (contents && !allow_js_access) { 2746 if (contents && !allow_js_access) {
2746 contents->web_contents()->GetController().LoadURL( 2747 contents->web_contents()->GetController().LoadURL(
2747 target_url, 2748 target_url,
2748 content::Referrer(), 2749 content::Referrer(),
2749 ui::PAGE_TRANSITION_LINK, 2750 ui::PAGE_TRANSITION_LINK,
2750 std::string()); // No extra headers. 2751 std::string()); // No extra headers.
2751 } 2752 }
2752 2753
2753 return contents != NULL; 2754 return contents != NULL;
2754 } 2755 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698